github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-12-28 12:40:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

i18n: Prevent data race in lang code handling

Browse source 
See #3564
This commit is contained in:
Bjørn Erik Pedersen 2017-11-04 09:43:35 +01:00
parent bb04010cbf
commit c97216e4f0
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
i18n/i18n.go
View file

@ -68,7 +68,9 @@ func (t Translator) initFuncs(bndl *bundle.Bundle) {
currentLang := lang currentLang := lang
t.translateFuncs[currentLang] = func(translationID string, args ...interface{}) string { t.translateFuncs[currentLang] = func(translationID string, args ...interface{}) string {
tpMu.RLock()
tFunc, err := bndl.Tfunc(currentLang) tFunc, err := bndl.Tfunc(currentLang)
tpMu.RUnlock()
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)
} }

2
i18n/translationProvider.go
View file

@ -25,7 +25,7 @@ import (
// Unfortunately this needs to be global, see // Unfortunately this needs to be global, see
// https://github.com/nicksnyder/go-i18n/issues/82 // https://github.com/nicksnyder/go-i18n/issues/82
var tpMu sync.Mutex var tpMu sync.RWMutex
// TranslationProvider provides translation handling, i.e. loading // TranslationProvider provides translation handling, i.e. loading
// of bundles etc. // of bundles etc.