From 5c91f0d75b10dca78f4d2b6593b67717e5e512cc Mon Sep 17 00:00:00 2001
From: Andrea Fercia <afercia@git.wordpress.org>
Date: Mon, 7 Oct 2019 11:52:32 +0000
Subject: [PATCH] Accessibility: Login and Registration: Improve the invalid
 username and invalid email messages.

- explicitly informs users they can use their email to log in as an alternative to their username and vice-versa
- shows the `Lost your password?` link only when an wrong password has been entered
- uses a more appropriate copy by changing "invalid" to "unknown"
- removes the all caps `ERROR`

Props subrataemfluence, zalak151291, ryokuhi, SergeyBiryukov, audrasjb, joedolson, marybaum, ramiy, markjaquith, chanthaboune, afercia.
Fixes #43037.


git-svn-id: https://develop.svn.wordpress.org/trunk@46417 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/user.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
index 69b8c35208..505048e57a 100644
--- a/src/wp-includes/user.php
+++ b/src/wp-includes/user.php
@@ -149,10 +149,7 @@ function wp_authenticate_username_password( $user, $username, $password ) {
 	if ( ! $user ) {
 		return new WP_Error(
 			'invalid_username',
-			__( '<strong>ERROR</strong>: Invalid username.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
-			'</a>'
+			__( 'Unknown username. Check again or try your email address.' )
 		);
 	}
 
@@ -230,10 +227,7 @@ function wp_authenticate_email_password( $user, $email, $password ) {
 	if ( ! $user ) {
 		return new WP_Error(
 			'invalid_email',
-			__( '<strong>ERROR</strong>: Invalid email address.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
-			'</a>'
+			__( 'Unknown email address. Check again or try your username.' )
 		);
 	}