summaryrefslogtreecommitdiffstats
path: root/store
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-11-13 10:59:13 -0500
committerJoramWilander <jwawilander@gmail.com>2015-11-13 10:59:13 -0500
commit7a0597e41b77b5cdd1958889bcd5444bb4a25dea (patch)
tree3ff44654999f1c632d30a0476d5d506a78af18d0 /store
parent1c1cd041c707c9a671e872fe33d96832c1800dc6 (diff)
downloadchat-7a0597e41b77b5cdd1958889bcd5444bb4a25dea.tar.gz
chat-7a0597e41b77b5cdd1958889bcd5444bb4a25dea.tar.bz2
chat-7a0597e41b77b5cdd1958889bcd5444bb4a25dea.zip
Fix cancel button on username setting and other general improvements
Diffstat (limited to 'store')
-rw-r--r--store/sql_user_store.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go
index d38b5c214..77ff5bfab 100644
--- a/store/sql_user_store.go
+++ b/store/sql_user_store.go
@@ -157,7 +157,7 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
if count, err := us.GetMaster().Update(user); err != nil {
if IsUniqueConstraintError(err.Error(), "Email", "users_email_teamid_key") {
- result.Err = model.NewAppError("SqlUserStore.Update", "This email is already taken. Please choose another", "user_id="+user.Id+", "+err.Error())
+ result.Err = model.NewAppError("SqlUserStore.Update", "This email is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error())
} else if IsUniqueConstraintError(err.Error(), "Username", "users_username_teamid_key") {
result.Err = model.NewAppError("SqlUserStore.Update", "This username is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error())
} else {