refactor: preparation of ja fr zh-Hant translation

WangNingkai · Nov 11, 2021 · a589731 · a589731
1 parent f0f8acd
commit a589731
Show file tree

Hide file tree

Showing 18 changed files with 158 additions and 116 deletions.
diff --git a/gofi-backend/i18n/en_us.go → gofi-backend/i18n/en.go b/gofi-backend/i18n/en_us.go → gofi-backend/i18n/en.go
@@ -1,6 +1,6 @@
 package i18n
 
-var EnUS = map[MessageKey]string{
+var En = map[MessageKey]string{
 	IsNotDir:                         "%s is not a folder",
 	IsNotFile:                        "%s is not a file",
 	IsNotTextFile:                    "%s is not a  text file",

diff --git a/gofi-backend/i18n/translate.go b/gofi-backend/i18n/translate.go
@@ -48,8 +48,8 @@ func (messageKey MessageKey) String() string {
 
 func init() {
 	for _, key := range TranslateKeys {
-		_ = message.SetString(language.Chinese, key.String(), ZhCN[key])
-		_ = message.SetString(language.English, key.String(), EnUS[key])
+		_ = message.SetString(language.SimplifiedChinese, key.String(), ZhHans[key])
+		_ = message.SetString(language.English, key.String(), En[key])
 	}
 	printer = message.NewPrinter(language.Chinese)
 }

diff --git a/gofi-backend/i18n/zh_cn.go → gofi-backend/i18n/zh_Hans.go b/gofi-backend/i18n/zh_cn.go → gofi-backend/i18n/zh_Hans.go
@@ -1,6 +1,6 @@
 package i18n
 
-var ZhCN = map[MessageKey]string{
+var ZhHans = map[MessageKey]string{
 	IsNotDir:                         "%s 不是文件夹",
 	IsNotFile:                        "%s 不是文件",
 	IsNotTextFile:                    "%s 不是文本文件",

diff --git a/gofi-backend/test/i18n_test.go b/gofi-backend/test/i18n_test.go
@@ -23,17 +23,17 @@ func TestLanguageTagParse(t *testing.T) {
 func TestChineseTranslate(t *testing.T) {
 	i18n.SwitchLanguage("zh-CN")
 	for _, key := range i18n.TranslateKeys {
-		template := i18n.ZhCN[key]
+		template := i18n.ZhHans[key]
 
 		if strings.Contains(template, "%s") {
 			placeholder := "/Users/Sloaix/Desktop/gofi"
-			expect := fmt.Sprintf(i18n.ZhCN[key], placeholder)
+			expect := fmt.Sprintf(i18n.ZhHans[key], placeholder)
 			actual := i18n.Translate(key, placeholder)
 			if actual != expect {
 				t.Errorf("\n expect: %s \n actual: %s", expect, actual)
 			}
 		} else {
-			expect := fmt.Sprintf(i18n.ZhCN[key])
+			expect := fmt.Sprintf(i18n.ZhHans[key])
 			actual := i18n.Translate(key)
 			if actual != expect {
 				t.Errorf("\n expect: %s \n actual: %s", expect, actual)
@@ -46,17 +46,17 @@ func TestChineseTranslate(t *testing.T) {
 func TestEnglishTranslate(t *testing.T) {
 	i18n.SwitchLanguage("en-US")
 	for _, key := range i18n.TranslateKeys {
-		template := i18n.ZhCN[key]
+		template := i18n.ZhHans[key]
 
 		if strings.Contains(template, "%s") {
 			placeholder := "/Users/Sloaix/Desktop/gofi"
-			expect := fmt.Sprintf(i18n.EnUS[key], placeholder)
+			expect := fmt.Sprintf(i18n.En[key], placeholder)
 			actual := i18n.Translate(key, placeholder)
 			if actual != expect {
 				t.Errorf("\n expect: %s \n actual: %s", expect, actual)
 			}
 		} else {
-			expect := fmt.Sprintf(i18n.EnUS[key])
+			expect := fmt.Sprintf(i18n.En[key])
 			actual := i18n.Translate(key)
 			if actual != expect {
 				t.Errorf("\n expect: %s \n actual: %s", expect, actual)
@@ -68,14 +68,14 @@ func TestEnglishTranslate(t *testing.T) {
 
 func TestKeyExist(t *testing.T) {
 	for _, key := range i18n.TranslateKeys {
-		_, ok := i18n.EnUS[key]
+		_, ok := i18n.En[key]
 		if !ok {
-			t.Errorf("key %s is not exist in EnUS", key)
+			t.Errorf("key %s is not exist in En", key)
 		}
 
-		_, ok = i18n.ZhCN[key]
+		_, ok = i18n.ZhHans[key]
 		if !ok {
-			t.Errorf("key %s is not exist in ZhCN", key)
+			t.Errorf("key %s is not exist in ZhHans", key)
 		}
 	}
 }
diff --git a/gofi-frontend/src/assets/en-US.svg b/gofi-frontend/src/assets/en-US.svg