From ec7a273550a1aaf31e80abc90c99d06a94664b5d Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Fri, 27 May 2016 09:01:35 -0400
Subject: Revert "PLT-1800 Load server side locale from the config.json"
 (#3133)

---
 mattermost.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mattermost.go')

diff --git a/mattermost.go b/mattermost.go
index 59b4e44d3..4f53828ad 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -78,6 +78,7 @@ func main() {
 
 	parseCmds()
 
+	utils.InitTranslations()
 	if errstr := doLoadConfig(flagConfigFile); errstr != "" {
 		l4g.Exit(utils.T("mattermost.unable_to_load_config"), errstr)
 		return
@@ -86,7 +87,6 @@ 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