Changeset 34354

Timestamp:

09/20/2015 09:10:59 AM (9 years ago)

Author:

ocean90

Message:

Login: Move the "Lost your password?" link into a separate string to reduce HTML tags in translation strings.

Props ramiy.
Fixes #31870.

File:

• trunk/src/wp-includes/user-functions.php (modified) (2 diffs)

trunk/src/wp-includes/user-functions.php

@@ -137 +137 @@
     $user = get_user_by('login', $username);
 
-    if ( !$user )
-        return new WP_Error( 'invalid_username', sprintf( __( '<strong>ERROR</strong>: Invalid username. <a href="%s">Lost your password?</a>' ), wp_lostpassword_url() ) );
+    if ( !$user ) {
+        return new WP_Error( 'invalid_username',
+            __( '<strong>ERROR</strong>: Invalid username.' ) .
+            ' <a href="' . wp_lostpassword_url() . '">' .
+            __( 'Lost your password?' ) .
+            '</a>'
+        );
+    }
 
     /**
@@ -153 +159 @@
         return $user;
 
-    if ( !wp_check_password($password, $user->user_pass, $user->ID) )
-        return new WP_Error( 'incorrect_password', sprintf( __( '<strong>ERROR</strong>: The password you entered for the username <strong>%1$s</strong> is incorrect. <a href="%2$s">Lost your password?</a>' ),
-        $username, wp_lostpassword_url() ) );
+    if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
+        return new WP_Error( 'incorrect_password',
+            sprintf(
+                /* translators: %s: user name */
+                __( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ),
+                '<strong>' . $username . '</strong>'
+            ) .
+            ' <a href="' . wp_lostpassword_url() . '">' .
+            __( 'Lost your password?' ) .
+            '</a>'
+        );
+    }
 
     return $user;