diff options
| author | enahum <nahumhbl@gmail.com> | 2016-06-02 16:47:26 -0300 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-06-02 12:47:26 -0700 |
| commit | 159953050a9c4fb700bbde79042ead4843b0bea5 (patch) | |
| tree | 747a022c5cf579599402447b5e5d0f51dfee9f76 /api/apitestlib.go | |
| parent | e44b8ec6d57fc55230a5c97ea105b7fd9ef59aca (diff) | |
| download | chat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.gz chat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.bz2 chat-159953050a9c4fb700bbde79042ead4843b0bea5.zip | |
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
Diffstat (limited to 'api/apitestlib.go')
| -rw-r--r-- | api/apitestlib.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go index ab342c6b7..a685528d1 100644 --- a/api/apitestlib.go +++ b/api/apitestlib.go @@ -30,7 +30,7 @@ type TestHelper struct { func SetupEnterprise() *TestHelper { if Srv == nil { utils.LoadConfig("config.json") - utils.InitTranslations() + utils.InitTranslations(utils.Cfg.LocalizationSettings) utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 utils.DisableDebugLogForTest() utils.License.Features.SetDefaults() @@ -50,7 +50,7 @@ func SetupEnterprise() *TestHelper { func Setup() *TestHelper { if Srv == nil { utils.LoadConfig("config.json") - utils.InitTranslations() + utils.InitTranslations(utils.Cfg.LocalizationSettings) utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 utils.DisableDebugLogForTest() NewServer() |