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 /model | |
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 'model')
-rw-r--r-- | model/config.go | 48 | ||||
-rw-r--r-- | model/user.go | 2 |
2 files changed, 15 insertions, 35 deletions
diff --git a/model/config.go b/model/config.go index 08b00b90f..674a352f0 100644 --- a/model/config.go +++ b/model/config.go @@ -204,27 +204,20 @@ type ComplianceSettings struct { EnableDaily *bool } -type LocalizationSettings struct { - DefaultServerLocale *string - DefaultClientLocale *string - AvailableLocales *string -} - type Config struct { - ServiceSettings ServiceSettings - TeamSettings TeamSettings - SqlSettings SqlSettings - LogSettings LogSettings - FileSettings FileSettings - EmailSettings EmailSettings - RateLimitSettings RateLimitSettings - PrivacySettings PrivacySettings - SupportSettings SupportSettings - GitLabSettings SSOSettings - GoogleSettings SSOSettings - LdapSettings LdapSettings - ComplianceSettings ComplianceSettings - LocalizationSettings LocalizationSettings + ServiceSettings ServiceSettings + TeamSettings TeamSettings + SqlSettings SqlSettings + LogSettings LogSettings + FileSettings FileSettings + EmailSettings EmailSettings + RateLimitSettings RateLimitSettings + PrivacySettings PrivacySettings + SupportSettings SupportSettings + GitLabSettings SSOSettings + GoogleSettings SSOSettings + LdapSettings LdapSettings + ComplianceSettings ComplianceSettings } func (o *Config) ToJson() string { @@ -520,21 +513,6 @@ func (o *Config) SetDefaults() { o.LdapSettings.NicknameAttribute = new(string) *o.LdapSettings.NicknameAttribute = "" } - - if o.LocalizationSettings.DefaultServerLocale == nil { - o.LocalizationSettings.DefaultServerLocale = new(string) - *o.LocalizationSettings.DefaultServerLocale = DEFAULT_LOCALE - } - - if o.LocalizationSettings.DefaultClientLocale == nil { - o.LocalizationSettings.DefaultClientLocale = new(string) - *o.LocalizationSettings.DefaultClientLocale = DEFAULT_LOCALE - } - - if o.LocalizationSettings.AvailableLocales == nil { - o.LocalizationSettings.AvailableLocales = new(string) - *o.LocalizationSettings.AvailableLocales = *o.LocalizationSettings.DefaultClientLocale - } } func (o *Config) IsValid() *AppError { diff --git a/model/user.go b/model/user.go index 9b52cfa97..7dee67381 100644 --- a/model/user.go +++ b/model/user.go @@ -136,6 +136,7 @@ func (u *User) PreSave() { u.Username = strings.ToLower(u.Username) u.Email = strings.ToLower(u.Email) + u.Locale = strings.ToLower(u.Locale) u.CreateAt = GetMillis() u.UpdateAt = u.CreateAt @@ -165,6 +166,7 @@ func (u *User) PreSave() { func (u *User) PreUpdate() { u.Username = strings.ToLower(u.Username) u.Email = strings.ToLower(u.Email) + u.Locale = strings.ToLower(u.Locale) u.UpdateAt = GetMillis() if u.AuthData != nil && *u.AuthData == "" { |