summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-06-01 09:56:13 -0300
committerChristopher Speller <crspeller@gmail.com>2016-06-01 08:56:13 -0400
commitb00a60ab71b2bd4640c8608d71805ba9caae97d9 (patch)
tree02137b19bc56e5041530e710955f039682da43c7 /web
parent7be2a05cf58c22d1edfab12a2b55569c5e48ab2f (diff)
downloadchat-b00a60ab71b2bd4640c8608d71805ba9caae97d9.tar.gz
chat-b00a60ab71b2bd4640c8608d71805ba9caae97d9.tar.bz2
chat-b00a60ab71b2bd4640c8608d71805ba9caae97d9.zip
PLT-1800 Load server side locale from the config.json (#3135)
* 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
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()