Changeset 6188

Timestamp:

10/04/2007 07:38:35 PM (19 years ago)

Author:

markjaquith

Message:

Some error message normalization from Viper007Bond and DD32. fixes #5139

File:

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

trunk/wp-admin/includes/user.php

@@ -88 +88 @@
     } else {
         if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) )
-            $errors->add( 'pass', __( "<strong>ERROR</strong>: you typed your new password only once." ));
+            $errors->add( 'pass', __( '<strong>ERROR</strong>: You entered your new password only once.' ));
     }
 
@@ -97 +97 @@
     /* checking the password has been typed twice the same */
     if ( $pass1 != $pass2 )
-        $errors->add( 'pass', __( '<strong>ERROR</strong>: Please type the same password in the two password fields.' ));
+        $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in the two password fields.' ));
 
     if (!empty ( $pass1 ))
@@ -103 +103 @@
 
     if ( !$update && !validate_username( $user->user_login ) )
-        $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid.  Please enter a valid username.' ));
+        $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid. 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.' ));
 
     /* checking e-mail address */
     if ( empty ( $user->user_email ) ) {
-        $errors->add( 'user_email', __( "<strong>ERROR</strong>: please type an e-mail address" ));
+        $errors->add( 'user_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ));
     } else
         if (!is_email( $user->user_email ) ) {
-            $errors->add( 'user_email', __( "<strong>ERROR</strong>: the email address isn't correct" ));
+            $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ));
         }