Changeset 48115 for trunk/src/wp-includes/user.php

Timestamp:

06/21/2020 01:58:46 PM (5 years ago)

Author:

afercia

Message:

I18N: Restore the "Error:" prefix for error messages.

Partially reverts [48059] as there's no full consensus on the removal of the text prefix. Further actions should be taken to improve consistency and accessibility of the admin notices. Keeps some improvements to the translatable strings from [48059].

Fixes #47656.

File:

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

trunk/src/wp-includes/user.php

@@ -135 +135 @@
 
         if ( empty( $username ) ) {
-            $error->add( 'empty_username', __( 'The username field is empty.' ) );
+            $error->add( 'empty_username', __( '<strong>Error</strong>: The username field is empty.' ) );
         }
 
         if ( empty( $password ) ) {
-            $error->add( 'empty_password', __( 'The password field is empty.' ) );
+            $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
         }
 
@@ -173 +173 @@
             sprintf(
                 /* translators: %s: User name. */
-                __( 'The password you entered for the username %s is incorrect.' ),
+                __( '<strong>Error</strong>: The password you entered for the username %s is incorrect.' ),
                 '<strong>' . $username . '</strong>'
             ) .
@@ -210 +210 @@
         if ( empty( $email ) ) {
             // Uses 'empty_username' for back-compat with wp_signon().
-            $error->add( 'empty_username', __( 'The email field is empty.' ) );
+            $error->add( 'empty_username', __( '<strong>Error</strong>: The email field is empty.' ) );
         }
 
         if ( empty( $password ) ) {
-            $error->add( 'empty_password', __( 'The password field is empty.' ) );
+            $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
         }
 
@@ -245 +245 @@
             sprintf(
                 /* translators: %s: Email address. */
-                __( 'The password you entered for the email address %s is incorrect.' ),
+                __( '<strong>Error</strong>: The password you entered for the email address %s is incorrect.' ),
                 '<strong>' . $email . '</strong>'
             ) .
@@ -320 +320 @@
 
         if ( $spammed ) {
-            return new WP_Error( 'spammer_account', __( 'Your account has been marked as a spammer.' ) );
+            return new WP_Error( 'spammer_account', __( '<strong>Error</strong>: Your account has been marked as a spammer.' ) );
         }
     }
@@ -2284 +2284 @@
 
     if ( ! ( $user instanceof WP_User ) ) {
-        return new WP_Error( 'invalidcombo', __( 'There is no account with that username or email address.' ) );
+        return new WP_Error( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
     }
 
@@ -2513 +2513 @@
     // Check the username.
     if ( '' === $sanitized_user_login ) {
-        $errors->add( 'empty_username', __( 'Please enter a username.' ) );
+        $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) );
     } elseif ( ! validate_username( $user_login ) ) {
-        $errors->add( 'invalid_username', __( 'This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+        $errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
         $sanitized_user_login = '';
     } elseif ( username_exists( $sanitized_user_login ) ) {
-        $errors->add( 'username_exists', __( 'This username is already registered. Please choose another one.' ) );
+        $errors->add( 'username_exists', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
 
     } else {
@@ -2524 +2524 @@
         $illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );
         if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) {
-            $errors->add( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
+            $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
         }
     }
@@ -2530 +2530 @@
     // Check the email address.
     if ( '' === $user_email ) {
-        $errors->add( 'empty_email', __( 'Please type your email address.' ) );
+        $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) );
     } elseif ( ! is_email( $user_email ) ) {
-        $errors->add( 'invalid_email', __( 'The email address isn&#8217;t correct.' ) );
+        $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ) );
         $user_email = '';
     } elseif ( email_exists( $user_email ) ) {
-        $errors->add( 'email_exists', __( 'This email is already registered. Please choose another one.' ) );
+        $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ) );
     }
 
@@ -2580 +2580 @@
             sprintf(
                 /* translators: %s: Admin email address. */
-                __( 'Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">site admin</a>!' ),
+                __( '<strong>Error</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">site admin</a>!' ),
                 get_option( 'admin_email' )
             )
@@ -2816 +2816 @@
             $errors->add(
                 'user_email',
-                __( 'The email address isn&#8217;t correct.' ),
+                __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ),
                 array(
                     'form-field' => 'email',
@@ -2828 +2828 @@
             $errors->add(
                 'user_email',
-                __( 'The email address is already used.' ),
+                __( '<strong>Error</strong>: The email address is already used.' ),
                 array(
                     'form-field' => 'email',