summaryrefslogtreecommitdiffstats
path: root/integrations/user_test.go
diff options
context:
space:
mode:
authorGusted <williamzijl7@hotmail.com>2022-06-26 16:19:22 +0200
committerGitHub <noreply@github.com>2022-06-26 22:19:22 +0800
commit5d3f99c7c6d0f2c304dc13c6fa6aa675daf310cc (patch)
treeb44b05216bef3051123cd6b2fd9495cee1b91ece /integrations/user_test.go
parent711cbcce8d6a193f5738c45861d11cb86b412ec7 (diff)
downloadgitea-5d3f99c7c6d0f2c304dc13c6fa6aa675daf310cc.tar.gz
gitea-5d3f99c7c6d0f2c304dc13c6fa6aa675daf310cc.zip
Make better use of i18n (#20096)
* Prototyping * Start work on creating offsets * Modify tests * Start prototyping with actual MPH * Twiddle around * Twiddle around comments * Convert templates * Fix external languages * Fix latest translation * Fix some test * Tidy up code * Use simple map * go mod tidy * Move back to data structure - Uses less memory by creating for each language a map. * Apply suggestions from code review Co-authored-by: delvh <dev.lh@web.de> * Add some comments * Fix tests * Try to fix tests * Use en-US as defacto fallback * Use correct slices * refactor (#4) * Remove TryTr, add log for missing translation key * Refactor i18n - Separate dev and production locale stores. - Allow for live-reloading in dev mode. Co-authored-by: zeripath <art27@cantab.net> * Fix live-reloading & check for errors * Make linter happy * live-reload with periodic check (#5) * Fix tests Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'integrations/user_test.go')
-rw-r--r--integrations/user_test.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/integrations/user_test.go b/integrations/user_test.go
index 41127a4e40..33113369a7 100644
--- a/integrations/user_test.go
+++ b/integrations/user_test.go
@@ -14,7 +14,7 @@ import (
user_model "code.gitea.io/gitea/models/user"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/modules/test"
- "code.gitea.io/gitea/modules/translation/i18n"
+ "code.gitea.io/gitea/modules/translation"
"github.com/stretchr/testify/assert"
)
@@ -67,7 +67,7 @@ func TestRenameInvalidUsername(t *testing.T) {
htmlDoc := NewHTMLParser(t, resp.Body)
assert.Contains(t,
htmlDoc.doc.Find(".ui.negative.message").Text(),
- i18n.Tr("en", "form.alpha_dash_dot_error"),
+ translation.NewLocale("en-US").Tr("form.alpha_dash_dot_error"),
)
unittest.AssertNotExistsBean(t, &user_model.User{Name: invalidUsername})
@@ -131,7 +131,7 @@ func TestRenameReservedUsername(t *testing.T) {
htmlDoc := NewHTMLParser(t, resp.Body)
assert.Contains(t,
htmlDoc.doc.Find(".ui.negative.message").Text(),
- i18n.Tr("en", "user.form.name_reserved", reservedUsername),
+ translation.NewLocale("en-US").Tr("user.form.name_reserved", reservedUsername),
)
unittest.AssertNotExistsBean(t, &user_model.User{Name: reservedUsername})