diff options
| -rw-r--r-- | api/user.go | 6 | ||||
| -rw-r--r-- | 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", |