ref: 8f2ab5f498fc8131ffe99840eac1f6091cec4a78
parent: cce49997a4f272b508ee98b83d40b087d0acf9e3
author: Albert Nigmatzianov <[email protected]>
date: Wed May 3 05:11:14 EDT 2017
i18n: Simplify code for detecting of untranslated id
--- a/i18n/i18n.go
+++ b/i18n/i18n.go
@@ -57,13 +57,8 @@
func (t Translator) initFuncs(bndl *bundle.Bundle) { defaultContentLanguage := t.cfg.GetString("defaultContentLanguage")- var (
- defaultT bundle.TranslateFunc
- err error
- )
- defaultT, err = bndl.Tfunc(defaultContentLanguage)
-
+ defaultT, err := bndl.Tfunc(defaultContentLanguage)
if err != nil { jww.WARN.Printf("No translation bundle found for default language %q", defaultContentLanguage)}
@@ -79,20 +74,17 @@
}
translated := tFunc(translationID, args...)
+ if translated != translationID {+ return translated
+ }
// If there is no translation for translationID,
// then Tfunc returns translationID itself.
- if translated == translationID {- // But if user set same translationID and translation, we should check
- // if it really untranslated this way:
- // If bndl contains the translationID for specified currentLang,
- // then the translationID is actually translated.
- _, contains := bndl.Translations()[currentLang][translationID]
- if contains {- return translated
- }
- } else {+ // But if user set same translationID and translation, we should check
+ // if it really untranslated:
+ if isIDTranslated(currentLang, translationID, bndl) {return translated
}
+
if t.cfg.GetBool("logI18nWarnings") { i18nWarningLogger.Printf("i18n|MISSING_TRANSLATION|%s|%s", currentLang, translationID)}
@@ -100,11 +92,22 @@
return "[i18n] " + translationID
}
if defaultT != nil {- if translated := defaultT(translationID, args...); translated != translationID {+ translated := defaultT(translationID, args...)
+ if translated != translationID {return translated
}
+ if isIDTranslated(defaultContentLanguage, translationID, bndl) {+ return translated
+ }
}
return ""
}
}
+}
+
+// If bndl contains the translationID for specified currentLang,
+// then the translationID is actually translated.
+func isIDTranslated(lang, id string, b *bundle.Bundle) bool {+ _, contains := b.Translations()[lang][id]
+ return contains
}