From 4ae7128ecb66cdddeb9d40a24970c6552814c18b Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 24 May 2016 10:39:56 -0400 Subject: Revert "PLT-1800 Load server side locale from the config.json (#3076)" This reverts commit 34beaa569bfb32f1607375f1d5a22859322060d2. --- api/apitestlib.go | 4 ++-- api/user.go | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'api') 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) -- cgit v1.2.3-1-g7c22