Changeset 33774 for trunk/src/wp-login.php

Timestamp:

08/28/2015 03:16:02 AM (9 years ago)

Author:

helen

Message:

Drop the hyphen from e-mail and standardize on email.

The AP Stylebook changed this in 2011, and we're woefully inconsistent, so let's go with the standard.

props morganestes, voldemortensen, niallkennedy (for patching on the previous AP style).
fixes #26156.

File:

• trunk/src/wp-login.php (modified) (7 diffs)

trunk/src/wp-login.php

@@ -282 +282 @@
 
     if ( empty( $_POST['user_login'] ) ) {
-        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
+        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.'));
     } elseif ( strpos( $_POST['user_login'], '@' ) ) {
         $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
@@ -303 +303 @@
 
     if ( !$user_data ) {
-        $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
+        $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.'));
         return $errors;
     }
@@ -408 +408 @@
 
     if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
-        wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
+        wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
 
     return true;
@@ -561 +561 @@
 <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
     <p>
-        <label for="user_login" ><?php _e('Username or E-mail:') ?><br />
+        <label for="user_login" ><?php _e('Username or Email:') ?><br />
         <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
     </p>
@@ -749 +749 @@
     </p>
     <p>
-        <label for="user_email"><?php _e('E-mail') ?><br />
+        <label for="user_email"><?php _e('Email') ?><br />
         <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
     </p>
     <?php
     /**
-     * Fires following the 'E-mail' field in the user registration form.
+     * Fires following the 'Email' field in the user registration form.
      *
      * @since 2.1.0
@@ -760 +760 @@
     do_action( 'register_form' );
     ?>
-    <p id="reg_passmail"><?php _e( 'Registration confirmation will be e-mailed to you.' ); ?></p>
+    <p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
     <br class="clear" />
     <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
@@ -873 +873 @@
             $errors->add('registerdisabled', __('User registration is currently not allowed.'));
         elseif  ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
-            $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
+            $errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
         elseif  ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
-            $errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
+            $errors->add('newpass', __('Check your email for your new password.'), 'message');
         elseif  ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
-            $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
+            $errors->add('registered', __('Registration complete. Please check your email.'), 'message');
         elseif ( strpos( $redirect_to, 'about.php?updated' ) )
             $errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );