From 7c8654171e893d827fcfdbe7864ab1712888b46a Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Tue, 12 Jul 2016 15:17:46 -0400 Subject: Revert "Letting email not validated error message through login. Changing invalid credentials error. (#3546)" This reverts commit 128e4f984ad565297ab1c7b8921d877d3a9c8f03. --- api/user.go | 6 +----- i18n/en.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/api/user.go b/api/user.go index 7dd26efd6..6ed2939d1 100644 --- a/api/user.go +++ b/api/user.go @@ -472,11 +472,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { if user, err = authenticateUser(user, password, mfaToken); err != nil { c.LogAuditWithUserId(user.Id, "failure") //c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, err.Error()) - if err.Id == "api.user.login.not_verified.app_error" { - c.Err = err - } else { - c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "") - } + c.Err = model.NewLocAppError("login", "api.user.login.invalid_credentials", nil, "") return } diff --git a/i18n/en.json b/i18n/en.json index 19c97bc95..04305774a 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1781,7 +1781,7 @@ }, { "id": "api.user.login.invalid_credentials", - "translation": "Your login credentials are incorrect." + "translation": "User ID or password incorrect." }, { "id": "api.user.login.not_provided.app_error", -- cgit v1.2.3-1-g7c22