summaryrefslogtreecommitdiffstats
path: root/web
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 /web
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 'web')
-rw-r--r--web/web_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/web/web_test.go b/web/web_test.go
index d4d9a5f26..0a9869e40 100644
--- a/web/web_test.go
+++ b/web/web_test.go
@@ -21,7 +21,7 @@ var URL string
func Setup() {
if api.Srv == nil {
utils.LoadConfig("config.json")
- utils.InitTranslations()
+ utils.InitTranslations(utils.Cfg.LocalizationSettings)
api.NewServer()
api.StartServer()
api.InitApi()