From 159953050a9c4fb700bbde79042ead4843b0bea5 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Thu, 2 Jun 2016 16:47:26 -0300
Subject: PLT-1800 Load server side locale from the config.json (#3202)

* PLT-1800 Load server side locale from the config.json

* Add support for locales with country specifics

* Fix localization on served locale file as plain/text

* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency

* Fix get locale on login_controller
---
 mattermost.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mattermost.go')

diff --git a/mattermost.go b/mattermost.go
index 9929f5973..bebb55c3b 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -79,7 +79,6 @@ func main() {
 
 	parseCmds()
 
-	utils.InitTranslations()
 	if errstr := doLoadConfig(flagConfigFile); errstr != "" {
 		l4g.Exit(utils.T("mattermost.unable_to_load_config"), errstr)
 		return
@@ -88,6 +87,7 @@ func main() {
 	if flagRunCmds {
 		utils.ConfigureCmdLineLog()
 	}
+	utils.InitTranslations(utils.Cfg.LocalizationSettings)
 
 	pwd, _ := os.Getwd()
 	l4g.Info(utils.T("mattermost.current_version"), model.CurrentVersion, model.BuildNumber, model.BuildDate, model.BuildHash, model.BuildHashEnterprise)
-- 
cgit v1.2.3-1-g7c22