diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-10-09 10:00:50 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-10-09 18:02:43 +0200 |
| commit | 506820435cacb39ce7bb1835f46a15e913b95828 (patch) | |
| tree | e4a7e7a07232fe3c32da831d1f2049ead00d5095 /langs | |
| parent | 49972d07925604fea45afe1ace7b5dcc6efc30bf (diff) | |
lang/i18n: Fix for language code case issue with pt-br etc.
Fixes #7804
Diffstat (limited to 'langs')
| -rw-r--r-- | langs/config.go | 2 | ||||
| -rw-r--r-- | langs/i18n/i18n.go | 5 | ||||
| -rw-r--r-- | langs/i18n/i18n_test.go | 12 |
3 files changed, 15 insertions, 4 deletions
diff --git a/langs/config.go b/langs/config.go index 08cd15009..3afd15df0 100644 --- a/langs/config.go +++ b/langs/config.go @@ -36,7 +36,7 @@ type LanguagesConfig struct { func LoadLanguageSettings(cfg config.Provider, oldLangs Languages) (c LanguagesConfig, err error) { - defaultLang := cfg.GetString("defaultContentLanguage") + defaultLang := strings.ToLower(cfg.GetString("defaultContentLanguage")) if defaultLang == "" { defaultLang = "en" cfg.Set("defaultContentLanguage", defaultLang) diff --git a/langs/i18n/i18n.go b/langs/i18n/i18n.go index 83144b89c..c0eac5837 100644 --- a/langs/i18n/i18n.go +++ b/langs/i18n/i18n.go @@ -66,12 +66,11 @@ func (t Translator) Func(lang string) translateFunc { func (t Translator) initFuncs(bndl *i18n.Bundle) { enableMissingTranslationPlaceholders := t.cfg.GetBool("enableMissingTranslationPlaceholders") for _, lang := range bndl.LanguageTags() { - currentLang := lang currentLangStr := currentLang.String() - currentLangKey := strings.TrimPrefix(currentLangStr, artificialLangTagPrefix) + // This may be pt-BR; make it case insensitive. + currentLangKey := strings.ToLower(strings.TrimPrefix(currentLangStr, artificialLangTagPrefix)) localizer := i18n.NewLocalizer(bndl, currentLangStr) - t.translateFuncs[currentLangKey] = func(translationID string, templateData interface{}) string { var pluralCount interface{} diff --git a/langs/i18n/i18n_test.go b/langs/i18n/i18n_test.go index 10570a4e3..fa78f708c 100644 --- a/langs/i18n/i18n_test.go +++ b/langs/i18n/i18n_test.go @@ -226,6 +226,18 @@ one = "abc"`), expected: "Show Me The Money", expectedFlag: "Show Me The Money", }, + // https: //github.com/gohugoio/hugo/issues/7804 + { + name: "lang-with-hyphen", + data: map[string][]byte{ + "pt-br.toml": []byte(`foo.one = "abc"`), + }, + args: 1, + lang: "pt-br", + id: "foo", + expected: "abc", + expectedFlag: "abc", + }, } func doTestI18nTranslate(t testing.TB, test i18nTest, cfg config.Provider) string { |