IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug to load the default locale if no system locale is found

Browse Source
This commit is contained in:
Elias Nahum
2016-01-21 12:30:14 -03:00
parent aa68caa8f0
commit c8d22ed1fb
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
utils/i18n.go
View File

@@ -36,18 +36,16 @@ func InitTranslations() {
func GetTranslationsBySystemLocale() i18n.TranslateFunc {
locale := model.DEFAULT_LOCALE
if userLanguage, err := jibber_jabber.DetectLanguage(); err == nil {
// only set the system locale if is supported, fallback to DEFAULT_LOCALE
if contains(userLanguage) {
if _, ok := locales[userLanguage]; ok {
locale = userLanguage
} else {
l4g.Error("Failed to load system translations for '%v' attempting to fall back to '%v'", locale, model.DEFAULT_LOCALE)
locale = model.DEFAULT_LOCALE
}
}
if locales[locale] == "" {
l4g.Error("Failed to load system translations for '%v' attempting to fall back to '%v'", locale, model.DEFAULT_LOCALE)
if locales[model.DEFAULT_LOCALE] == "" {
panic("Failed to load system translations for '" + model.DEFAULT_LOCALE + "'")
}
if locales[model.DEFAULT_LOCALE] == "" {
panic("Failed to load system translations for '" + model.DEFAULT_LOCALE + "'")
}
translations, _ := i18n.Tfunc(locale)
@@ -141,12 +139,3 @@ func getTranslationsAndLocale(w http.ResponseWriter, r *http.Request) (i18n.Tran
SetLocaleCookie(w, model.DEFAULT_LOCALE, 10)
return translations, model.DEFAULT_LOCALE
}
func contains(l string) bool {
for _, a := range locales {
if a == l {
return true
}
}
return false
}