diff options
| author | enahum <nahumhbl@gmail.com> | 2016-06-02 16:47:26 -0300 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-06-02 12:47:26 -0700 |
| commit | 159953050a9c4fb700bbde79042ead4843b0bea5 (patch) | |
| tree | 747a022c5cf579599402447b5e5d0f51dfee9f76 /api | |
| parent | e44b8ec6d57fc55230a5c97ea105b7fd9ef59aca (diff) | |
| download | chat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.gz chat-159953050a9c4fb700bbde79042ead4843b0bea5.tar.bz2 chat-159953050a9c4fb700bbde79042ead4843b0bea5.zip | |
PLT-1800 Load server side locale from the config.json (#3202)
* 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
* Remove github.com/cloudfoundry/jibber_jabber as vendor dependency
* Fix get locale on login_controller
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 e62d34dcc..63a460dc5 100644 --- a/api/api.go +++ b/api/api.go @@ -10,7 +10,6 @@ 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 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() diff --git a/api/user.go b/api/user.go index caf573463..4d4518824 100644 --- a/api/user.go +++ b/api/user.go @@ -239,6 +239,7 @@ 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) |