summaryrefslogtreecommitdiffstats
path: root/mattermost.go
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-05-24 09:36:27 -0300
committerJoram Wilander <jwawilander@gmail.com>2016-05-24 08:36:27 -0400
commit34beaa569bfb32f1607375f1d5a22859322060d2 (patch)
treec5d264e383890c88263db071a555201e4bc8e159 /mattermost.go
parent79c0b206895ce6c5ffa498cdc80edbd821ff5469 (diff)
downloadchat-34beaa569bfb32f1607375f1d5a22859322060d2.tar.gz
chat-34beaa569bfb32f1607375f1d5a22859322060d2.tar.bz2
chat-34beaa569bfb32f1607375f1d5a22859322060d2.zip
PLT-1800 Load server side locale from the config.json (#3076)
* PLT-1800 Load server side locale from the config.json * Add support for locales with country specifics
Diffstat (limited to 'mattermost.go')
-rw-r--r--mattermost.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/mattermost.go b/mattermost.go
index 3def1e0d9..e8abf8351 100644
--- a/mattermost.go
+++ b/mattermost.go
@@ -77,7 +77,6 @@ func main() {
parseCmds()
- utils.InitTranslations()
if errstr := doLoadConfig(flagConfigFile); errstr != "" {
l4g.Exit(utils.T("mattermost.unable_to_load_config"), errstr)
return
@@ -86,6 +85,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)