summaryrefslogtreecommitdiffstats
path: root/api/apitestlib.go
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-05-27 09:25:37 -0300
committerJoram Wilander <jwawilander@gmail.com>2016-05-27 08:25:37 -0400
commita2c183f401bdf8e9abddd35d4561d42034325046 (patch)
tree66565a9e21ad6b47b4dca18113ad9be48bd98492 /api/apitestlib.go
parent15e427e806716b372f7fbef12d922f847ccc71b5 (diff)
downloadchat-a2c183f401bdf8e9abddd35d4561d42034325046.tar.gz
chat-a2c183f401bdf8e9abddd35d4561d42034325046.tar.bz2
chat-a2c183f401bdf8e9abddd35d4561d42034325046.zip
PLT-1800 Load server side locale from the config.json (#3092)
* 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
Diffstat (limited to 'api/apitestlib.go')
-rw-r--r--api/apitestlib.go4
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()