diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-06-01 11:56:27 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-06-01 11:56:27 -0400 |
| commit | 786e4dce7d520f79b8cf76939d84678d72941420 (patch) | |
| tree | 5bb520880d200cba90c5ada250c63144e18c3333 /api | |
| parent | b00a60ab71b2bd4640c8608d71805ba9caae97d9 (diff) | |
| download | chat-786e4dce7d520f79b8cf76939d84678d72941420.tar.gz chat-786e4dce7d520f79b8cf76939d84678d72941420.tar.bz2 chat-786e4dce7d520f79b8cf76939d84678d72941420.zip | |
Revert "PLT-1800 Load server side locale from the config.json" (#3201)
Diffstat (limited to 'api')
| -rw-r--r-- | api/api.go | 1 | ||||
| -rw-r--r-- | api/apitestlib.go | 4 | ||||
| -rw-r--r-- | api/user.go | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/api.go b/api/api.go index 63a460dc5..e62d34dcc 100644 --- a/api/api.go +++ b/api/api.go @@ -10,6 +10,7 @@ import ( "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" + _ "github.com/cloudfoundry/jibber_jabber" _ "github.com/nicksnyder/go-i18n/i18n" ) 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 4d4518824..caf573463 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) |