Changeset 47156 for trunk/src/wp-admin/includes/user.php

Timestamp:

02/01/2020 09:36:44 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Accessibility: Text Changes: Use sentence case for the word Error in various error messages, instead of all caps.

Using all caps should be avoided for better readability and because screen readers may pronounce all-caps words as abbreviations.

Props afercia, ryokuhi, sabernhardt, garrett-eclipse.
See #47656, #43037, #42945.

File:

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

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

@@ -145 +145 @@
     /* 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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: Please enter a nickname.' ) );
     }
 
@@ -166 +166 @@
     // 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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
     }
 
@@ -184 +184 @@
 
     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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
     }
 
@@ -195 +195 @@
 
     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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
         }
     }