i18n: Prevent data race in lang code handling

See #3564
gohugoio · Nov 4, 2017 · c97216e · c97216e
1 parent bb04010
commit c97216e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/i18n/i18n.go b/i18n/i18n.go
@@ -68,7 +68,9 @@ func (t Translator) initFuncs(bndl *bundle.Bundle) {
 		currentLang := lang
 
 		t.translateFuncs[currentLang] = func(translationID string, args ...interface{}) string {
+			tpMu.RLock()
 			tFunc, err := bndl.Tfunc(currentLang)
+			tpMu.RUnlock()
 			if err != nil {
 				jww.WARN.Printf("could not load translations for language %q (%s), will use default content language.\n", lang, err)
 			}

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