summaryrefslogtreecommitdiffstats
path: root/model/user.go
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-06-02 16:47:26 -0300
committerCorey Hulen <corey@hulen.com>2016-06-02 12:47:26 -0700
commit159953050a9c4fb700bbde79042ead4843b0bea5 (patch)
tree747a022c5cf579599402447b5e5d0f51dfee9f76 /model/user.go
parente44b8ec6d57fc55230a5c97ea105b7fd9ef59aca (diff)
downloadchat-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 'model/user.go')
-rw-r--r--model/user.go2
1 files changed, 0 insertions, 2 deletions
diff --git a/model/user.go b/model/user.go
index b7717c4ff..ab076894a 100644
--- a/model/user.go
+++ b/model/user.go
@@ -136,7 +136,6 @@ 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
@@ -166,7 +165,6 @@ 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 == "" {