Permalink
Browse files

i18n: Improve the detection of untranslated string

Fix #2607
  • Loading branch information...
bogem authored and bep committed May 2, 2017
1 parent 635b3bb commit a40d1f6ed2aedddc99725658993258cd557640ed
Showing with 15 additions and 1 deletion.
  1. +15 −1 i18n/i18n.go
View
@@ -76,7 +76,21 @@ func (t Translator) initFuncs(bndl *bundle.Bundle) {
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)
} else if translated := tFunc(translationID, args...); translated != translationID {
}
translated := tFunc(translationID, args...)
// 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 {
return translated
}
if t.cfg.GetBool("logI18nWarnings") {

0 comments on commit a40d1f6

Please sign in to comment.