github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-02-19 22:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

i18n: Improve the detection of untranslated string

Browse source 
Fix #2607
This commit is contained in:
Albert Nigmatzianov 2017-05-02 19:01:05 +02:00 committed by Bjørn Erik Pedersen
parent 635b3bb4eb
commit a40d1f6ed2
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
i18n/i18n.go
View file

@ -76,7 +76,21 @@ func (t Translator) initFuncs(bndl *bundle.Bundle) {
tFunc, err := bndl.Tfunc(currentLang) tFunc, err := bndl.Tfunc(currentLang)
if err != nil { if err != nil {
jww.WARN.Printf("could not load translations for language %q (%s), will use default content language.\n", lang, err) 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 return translated
} }
if t.cfg.GetBool("logI18nWarnings") { if t.cfg.GetBool("logI18nWarnings") {