diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-27 09:01:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-27 09:01:35 -0400 |
| commit | ec7a273550a1aaf31e80abc90c99d06a94664b5d (patch) | |
| tree | bd0d1080a5ef66b9e7985682919b1c2bd21d4bf1 /api | |
| parent | a2c183f401bdf8e9abddd35d4561d42034325046 (diff) | |
| download | chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.tar.gz chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.tar.bz2 chat-ec7a273550a1aaf31e80abc90c99d06a94664b5d.zip | |
Revert "PLT-1800 Load server side locale from the config.json" (#3133)
Diffstat (limited to 'api')
| -rw-r--r-- | api/apitestlib.go | 4 | ||||
| -rw-r--r-- | api/user.go | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/api/apitestlib.go b/api/apitestlib.go index a685528d1..ab342c6b7 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.Cfg.LocalizationSettings) + utils.InitTranslations() 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.Cfg.LocalizationSettings) + utils.InitTranslations() utils.Cfg.TeamSettings.MaxUsersPerTeam = 50 utils.DisableDebugLogForTest() NewServer() diff --git a/api/user.go b/api/user.go index 3c4e5f911..c1b40852d 100644 --- a/api/user.go +++ b/api/user.go @@ -239,7 +239,6 @@ func CreateUser(user *model.User) (*model.User, *model.AppError) { } user.MakeNonNil() - user.Locale = *utils.Cfg.LocalizationSettings.DefaultClientLocale if result := <-Srv.Store.User().Save(user); result.Err != nil { l4g.Error(utils.T("api.user.create_user.save.error"), result.Err) |