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

Timestamp:

06/16/2020 03:33:37 PM (5 years ago)

Author:

afercia

Message:

I18N: Remove the "Error:" prefix from error messages.

For a number of years, most of the WordPress error messages have been prefixed with "Error:". However, these messages appear in a context where it's already clear an error occurred. Whether it's an error, a warning, or any other classification, that's not so relevant for users. The content of the message is the relevant part. The "Error:" prefix doesn't add great value while it does add unnecessary complexity for the message readability.

Also, revises some of these messages to improve clarity and removes HTML from translatable strings.

Props garrett-eclipse, ramiy, SergeyBiryukov, afercia, sabernhardt, quadthemes, audrasjb.
See #47003, #43037, #42945, #15887.
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', __( '<strong>Error</strong>: The username field is empty.' ) );
+            $error->add( 'empty_username', __( 'The username field is empty.' ) );
         }
 
         if ( empty( $password ) ) {
-            $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
+            $error->add( 'empty_password', __( 'The password field is empty.' ) );
         }
 
@@ -173 +173 @@
             sprintf(
                 /* translators: %s: User name. */
-                __( '<strong>Error</strong>: The password you entered for the username %s is incorrect.' ),
+                __( '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', __( '<strong>Error</strong>: The email field is empty.' ) );
+            $error->add( 'empty_username', __( 'The email field is empty.' ) );
         }
 
         if ( empty( $password ) ) {
-            $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
+            $error->add( 'empty_password', __( 'The password field is empty.' ) );
         }
 
@@ -245 +245 @@
             sprintf(
                 /* translators: %s: Email address. */
-                __( '<strong>Error</strong>: The password you entered for the email address %s is incorrect.' ),
+                __( 'The password you entered for the email address %s is incorrect.' ),
                 '<strong>' . $email . '</strong>'
             ) .
@@ -320 +320 @@
 
         if ( $spammed ) {
-            return new WP_Error( 'spammer_account', __( '<strong>Error</strong>: Your account has been marked as a spammer.' ) );
+            return new WP_Error( 'spammer_account', __( 'Your account has been marked as a spammer.' ) );
         }
     }
@@ -2279 +2279 @@
 
     if ( ! ( $user instanceof WP_User ) ) {
-        return new WP_Error( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
+        return new WP_Error( 'invalidcombo', __( 'There is no account with that username or email address.' ) );
     }
 
@@ -2508 +2508 @@
     // Check the username.
     if ( '' === $sanitized_user_login ) {
-        $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) );
+        $errors->add( 'empty_username', __( 'Please enter a username.' ) );
     } elseif ( ! validate_username( $user_login ) ) {
-        $errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+        $errors->add( 'invalid_username', __( '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', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
+        $errors->add( 'username_exists', __( 'This username is already registered. Please choose another one.' ) );
 
     } else {
@@ -2519 +2519 @@
         $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', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
+            $errors->add( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
         }
     }
@@ -2525 +2525 @@
     // Check the email address.
     if ( '' === $user_email ) {
-        $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) );
+        $errors->add( 'empty_email', __( 'Please type your email address.' ) );
     } elseif ( ! is_email( $user_email ) ) {
-        $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ) );
+        $errors->add( 'invalid_email', __( 'The email address isn&#8217;t correct.' ) );
         $user_email = '';
     } elseif ( email_exists( $user_email ) ) {
-        $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ) );
+        $errors->add( 'email_exists', __( 'This email is already registered. Please choose another one.' ) );
     }
 
@@ -2575 +2575 @@
             sprintf(
                 /* translators: %s: Admin email address. */
-                __( '<strong>Error</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">site admin</a>!' ),
+                __( 'Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a>!' ),
                 get_option( 'admin_email' )
             )
@@ -2810 +2810 @@
             $errors->add(
                 'user_email',
-                __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ),
+                __( 'The email address isn&#8217;t correct.' ),
                 array(
                     'form-field' => 'email',
@@ -2822 +2822 @@
             $errors->add(
                 'user_email',
-                __( '<strong>Error</strong>: The email address is already used.' ),
+                __( 'The email address is already used.' ),
                 array(
                     'form-field' => 'email',