From 786e4dce7d520f79b8cf76939d84678d72941420 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Wed, 1 Jun 2016 11:56:27 -0400
Subject: Revert "PLT-1800 Load server side locale from the config.json"
 (#3201)

---
 utils/config.go      |  3 +--
 utils/config_test.go |  2 +-
 utils/i18n.go        | 31 ++++++++++++-------------------
 3 files changed, 14 insertions(+), 22 deletions(-)

(limited to 'utils')

diff --git a/utils/config.go b/utils/config.go
index a3969fc40..313b4e29c 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -246,8 +246,7 @@ func getClientConfig(c *model.Config) map[string]string {
 	props["WebsocketPort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketPort)
 	props["WebsocketSecurePort"] = fmt.Sprintf("%v", *c.ServiceSettings.WebsocketSecurePort)
 
-	props["DefaultClientLocale"] = *c.LocalizationSettings.DefaultClientLocale
-	props["AvailableLocales"] = *c.LocalizationSettings.AvailableLocales
+	props["AllowCorsFrom"] = *c.ServiceSettings.AllowCorsFrom
 
 	if IsLicensed {
 		if *License.Features.CustomBrand {
diff --git a/utils/config_test.go b/utils/config_test.go
index 96ef49696..6f36b30c3 100644
--- a/utils/config_test.go
+++ b/utils/config_test.go
@@ -9,5 +9,5 @@ import (
 
 func TestConfig(t *testing.T) {
 	LoadConfig("config.json")
-	InitTranslations(Cfg.LocalizationSettings)
+	InitTranslations()
 }
diff --git a/utils/i18n.go b/utils/i18n.go
index b3e10a831..2503cd500 100644
--- a/utils/i18n.go
+++ b/utils/i18n.go
@@ -7,16 +7,15 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
+	"github.com/cloudfoundry/jibber_jabber"
 	"github.com/mattermost/platform/model"
 	"github.com/nicksnyder/go-i18n/i18n"
 )
 
 var T i18n.TranslateFunc
 var locales map[string]string = make(map[string]string)
-var settings model.LocalizationSettings
 
-func InitTranslations(localizationSettings model.LocalizationSettings) {
-	settings = localizationSettings
+func InitTranslations() {
 	InitTranslationsWithDir("i18n")
 }
 
@@ -35,10 +34,14 @@ func InitTranslationsWithDir(dir string) {
 }
 
 func GetTranslationsBySystemLocale() i18n.TranslateFunc {
-	locale := *settings.DefaultServerLocale
-	if _, ok := locales[locale]; !ok {
-		l4g.Error("Failed to load system translations for '%v' attempting to fall back to '%v'", locale, model.DEFAULT_LOCALE)
-		locale = model.DEFAULT_LOCALE
+	locale := model.DEFAULT_LOCALE
+	if userLanguage, err := jibber_jabber.DetectLanguage(); err == nil {
+		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] == "" {
@@ -69,20 +72,10 @@ func SetTranslations(locale string) i18n.TranslateFunc {
 }
 
 func GetTranslationsAndLocale(w http.ResponseWriter, r *http.Request) (i18n.TranslateFunc, string) {
-	// This is for checking against locales like pt_BR or zn_CN
-	headerLocaleFull := strings.Split(r.Header.Get("Accept-Language"), ",")[0]
-	// This is for checking agains locales like en, es
 	headerLocale := strings.Split(strings.Split(r.Header.Get("Accept-Language"), ",")[0], "-")[0]
-	defaultLocale := *settings.DefaultClientLocale
-	if locales[headerLocaleFull] != "" {
-		translations := TfuncWithFallback(headerLocaleFull)
-		return translations, headerLocaleFull
-	} else if locales[headerLocale] != "" {
+	if locales[headerLocale] != "" {
 		translations := TfuncWithFallback(headerLocale)
 		return translations, headerLocale
-	} else if locales[defaultLocale] != "" {
-		translations := TfuncWithFallback(defaultLocale)
-		return translations, headerLocale
 	}
 
 	translations := TfuncWithFallback(model.DEFAULT_LOCALE)
@@ -96,7 +89,7 @@ func TfuncWithFallback(pref string) i18n.TranslateFunc {
 			return translated
 		}
 
-		t, _ := i18n.Tfunc(model.DEFAULT_LOCALE)
+		t, _ := i18n.Tfunc("en")
 		return t(translationID, args...)
 	}
 }
-- 
cgit v1.2.3-1-g7c22