diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-08-09 12:41:56 +0300 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2016-09-06 18:32:19 +0300 |
commit | f1e1cdab3fd60e256a18149b4e39e6ba5980c803 (patch) | |
tree | a947c83be280751dd16187d2664abc915ec64f40 /tpl | |
parent | 8da040342eb0a3098e54dc6ed2cb10bac6173230 (diff) |
Improve i18n string handling
* Fall back to default language on missing translation file
* Add a i18n-warnings build flag
* If that flag is set, print a parseable and greppable string on missing translation strings
See #2303
Diffstat (limited to 'tpl')
-rw-r--r-- | tpl/template_i18n.go | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/tpl/template_i18n.go b/tpl/template_i18n.go index 462b30a80..e46e49bdb 100644 --- a/tpl/template_i18n.go +++ b/tpl/template_i18n.go @@ -17,7 +17,14 @@ import ( "fmt" "github.com/nicksnyder/go-i18n/i18n/bundle" + "github.com/spf13/hugo/helpers" jww "github.com/spf13/jwalterweatherman" + "github.com/spf13/viper" +) + +var ( + Logi18nWarnings bool + i18nWarningLogger = helpers.NewDistinctFeedbackLogger() ) type translate struct { @@ -33,29 +40,48 @@ var translater *translate = &translate{translateFuncs: make(map[string]bundle.Tr func SetTranslateLang(lang string) error { if f, ok := translater.translateFuncs[lang]; ok { translater.current = f - return nil + } else { + jww.WARN.Printf("Translation func for language %v not found, use default.", lang) + translater.current = translater.translateFuncs[viper.GetString("DefaultContentLanguage")] } - jww.WARN.Printf("Translation func for language %v not found", lang) return nil } func SetI18nTfuncs(bndl *bundle.Bundle) { + defaultContentLanguage := viper.GetString("DefaultContentLanguage") + var ( + defaultT bundle.TranslateFunc + err error + ) + + defaultT, err = bndl.Tfunc(defaultContentLanguage) + + if err != nil { + jww.WARN.Printf("No translation bundle found for default language %q", defaultContentLanguage) + } + for _, lang := range bndl.LanguageTags() { - tFunc, err := bndl.Tfunc(lang) - if err == nil { - translater.translateFuncs[lang] = tFunc + currentLang := lang + tFunc, err := bndl.Tfunc(currentLang) + + if err != nil { + jww.WARN.Printf("could not load translations for language %q (%s), will use default content language.\n", lang, err) + translater.translateFuncs[currentLang] = defaultT continue } - jww.WARN.Printf("could not load translations for language %q (%s), will not translate!\n", lang, err.Error()) - translater.translateFuncs[lang] = bundle.TranslateFunc(func(id string, args ...interface{}) string { - // TODO: depending on the site mode, we might want to fall back on the default - // language's translation. - // TODO: eventually, we could add --i18n-warnings and print something when - // such things happen. - return fmt.Sprintf("[i18n: %s]", id) - }) + translater.translateFuncs[currentLang] = func(translationID string, args ...interface{}) string { + if translated := tFunc(translationID, args...); translated != translationID { + return translated + } + if Logi18nWarnings { + i18nWarningLogger.Printf("i18n|MISSING_TRANSLATION|%s|%s", currentLang, translationID) + } + if defaultT != nil { + return defaultT(translationID, args...) + } + return fmt.Sprintf("[i18n] %s", translationID) + } } - } func I18nTranslate(id string, args ...interface{}) (string, error) { |