Changeset 48059 for trunk/src/wp-admin/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-admin/includes/user.php (modified) (4 diffs)

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

@@ -144 +144 @@
     /* checking that username has been typed */
     if ( '' === $user->user_login ) {
-        $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
+        $errors->add( 'user_login', __( 'Please enter a username.' ) );
     }
 
     /* checking that nickname has been typed */
     if ( $update && empty( $user->nickname ) ) {
-        $errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
+        $errors->add( 'nickname', __( 'Please enter a nickname.' ) );
     }
 
@@ -165 +165 @@
     // Check for blank password when adding a user.
     if ( ! $update && empty( $pass1 ) ) {
-        $errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
+        $errors->add( 'pass', __( 'Please enter a password.' ), array( 'form-field' => 'pass1' ) );
     }
 
     // Check for "\" in password.
     if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
-        $errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
+        $errors->add( 'pass', __( 'Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
     }
 
     // Checking the password has been typed twice the same.
     if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
-        $errors->add( 'pass', __( '<strong>Error</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+        $errors->add( 'pass', __( 'Passwords don&#8217;t match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
     }
 
@@ -183 +183 @@
 
     if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
-        $errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+        $errors->add( 'user_login', __( 'This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
     }
 
     if ( ! $update && username_exists( $user->user_login ) ) {
-        $errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
+        $errors->add( 'user_login', __( 'This username is already registered. Please choose another one.' ) );
     }
 
@@ -194 +194 @@
 
     if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_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.' ) );
     }
 
     /* checking email address */
     if ( empty( $user->user_email ) ) {
-        $errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
+        $errors->add( 'empty_email', __( 'Please enter an email address.' ), array( 'form-field' => 'email' ) );
     } elseif ( ! is_email( $user->user_email ) ) {
-        $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
+        $errors->add( 'invalid_email', __( 'The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
     } else {
         $owner_id = email_exists( $user->user_email );
         if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
-            $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
+            $errors->add( 'email_exists', __( 'This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
         }
     }