From 7a0597e41b77b5cdd1958889bcd5444bb4a25dea Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Fri, 13 Nov 2015 10:59:13 -0500 Subject: Fix cancel button on username setting and other general improvements --- store/sql_user_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'store') 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 { -- cgit v1.2.3-1-g7c22