diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-24 10:39:56 -0400 |
| commit | 4ae7128ecb66cdddeb9d40a24970c6552814c18b (patch) | |
| tree | b979b83b3c25be0c817b3b4f4dc4d17735801048 /api | |
| parent | 3b5a5110c72d7eb2c94d9f428145383b15bd0e4e (diff) | |
| download | chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.gz chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.tar.bz2 chat-4ae7128ecb66cdddeb9d40a24970c6552814c18b.zip | |
Revert "PLT-1800 Load server side locale from the config.json (#3076)"
This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2.
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 628e978e9..f6c7c25f5 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) |