Getting i18n/v2 working

Author: allmightyspiff

plugin/i18n/i18n.go

@@ -32,6 +32,18 @@ var SUPPORTED_LOCALES = []string{
 var resourcePath = filepath.Join("plugin", "i18n", "resources")
 var localizer = Init()
 
+
+// var matcher = InitMatcher()
+
+
+// func InitMatcher() language.Matcher {
+// 	var supported []language.Tag
+// 	for _, lang := range SUPPORTED_LOCALES {
+// 		supported = append(supported, language.MustParse(lang))
+// 	}
+// 	return language.NewMatcher(supported)
+// }
+
 func GetResourcePath() string {
 	return resourcePath
 }
@@ -49,7 +61,7 @@ func T(text string, subs ...interface{}) string {
 	config := &goi18n.LocalizeConfig{DefaultMessage: message}
 	l_string, err := localizer.Localize(config)
 	if err != nil {
-		fmt.Printf("ERROR i18n\n")
+		fmt.Printf("ERROR i18n\n%v\n", err.Error())
 		return err.Error()
 	}
 	return l_string
@@ -63,19 +75,23 @@ func Init() *goi18n.Localizer {
 	bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
 	bundle.MustLoadMessageFile("plugin/i18n/resources/en_US.json")
 	bundle.MustLoadMessageFile("plugin/i18n/resources/ja_JP.json")
-	loc := goi18n.NewLocalizer(bundle, language.English.String())
+	loc := goi18n.NewLocalizer(bundle, "ja_JP")
 	return loc
 }
 
-/*
-func initWithLocale(locale string) goi18n.TranslateFunc {
-	err := loadFromAsset(locale)
-	if err != nil {
-		locale = DEFAULT_LOCALE
+
+func InitWithLocale(locale string)  {
+	bundle := goi18n.NewBundle(language.English)
+	bundle.RegisterUnmarshalFunc("json", json.Unmarshal)
+	bundle.MustLoadMessageFile("plugin/i18n/resources/en_US.json")
+	if locale != "en_US" {
+		bundle.MustLoadMessageFile(fmt.Sprintf("plugin/i18n/resources/%s.json", locale))	
 	}
-	return goi18n.MustTfunc(locale)
+	loc := goi18n.NewLocalizer(bundle, locale)
+	localizer = loc
 }
 
+/*
 func loadFromAsset(locale string) (err error) {
 	assetName := locale + ".all.json"
 	assetKey := filepath.Join(resourcePath, assetName)

plugin/i18n/i18n_test.go

@@ -59,22 +59,22 @@ var _ = Describe("I18NTests", func() {
 
 				It("Testing "+language, func() {
 					coreConfig.SetLocale(language)
-					translator := i18n.Init(coreConfig)
-					Expect(translator("Recurring Price")).To(Equal(xlationMap[language]))
+					i18n.InitWithLocale(language)
+					Expect(i18n.T("Recurring Price")).To(Equal(xlationMap[language]))
 				})
 				It("Testing "+language+" everything", func() {
 					// If these fails as untranslated, try running ./bin/generate-i18n-resources.sh
 					regex, _ := regexp.Compile("{{.([[:alnum:]])*}}")
 					coreConfig.SetLocale(language)
-					translator := i18n.Init(coreConfig)
-					file, err := ioutil.ReadFile("resources/" + language + ".all.json")
+					i18n.InitWithLocale(language)
+					file, err := ioutil.ReadFile("resources/" + language + ".json")
 					Expect(err).NotTo(HaveOccurred())
 					xlations := []I18nXlation{}
 					jsonErr := json.Unmarshal([]byte(file), &xlations)
 					Expect(jsonErr).NotTo(HaveOccurred())
 					for i := 0; i < len(xlations); i++ {
 						subs := regex.ReplaceAllString(xlations[i].Translation, "<no value>")
-						Expect(translator(xlations[i].Id)).To(Equal(subs))
+						Expect(i18n.T(xlations[i].Id)).To(Equal(subs))
 					}
 				})
 			}
@@ -91,10 +91,10 @@ var _ = Describe("I18NTests", func() {
 				envLang := strings.Replace(language, "_", "-", 1)
 				It("LANGUAGE="+envLang, func() {
 					os.Setenv("LANGUAGE", envLang)
-					translator := i18n.Init(coreConfig)
+					i18n.InitWithLocale(language)
 					locale := i18n.DetectLocal()
 					Expect(locale).To(Equal(language))
-					Expect(translator("Recurring Price")).To(Equal(xlationMap[language]))
+					Expect(i18n.T("Recurring Price")).To(Equal(xlationMap[language]))
 				})
 			}
 		})