Revert "Letting email not validated error message through login. Changing invalid credentials error. (#3546)"

This reverts commit 128e4f984a.

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
 	}
 

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",