Ticket #26156: wp-login.email.diff

wp-login.php

@@ -267 +266 @@
         $errors = new WP_Error();
 
         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.'));
         } else if ( strpos( $_POST['user_login'], '@' ) ) {
                 $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
                 if ( empty( $user_data ) )
@@ -288 +287 @@
                 return $errors;
 
         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;
         }
 
@@ -385 +384 @@
         $message = apply_filters( 'retrieve_password_message', $message, $key );
 
         if ( $message && !wp_mail($user_email, $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;
 }
@@ -520 +519 @@
 
 <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( 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>
         <?php
@@ -679 +678 @@
                 <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr(wp_unslash($user_login)); ?>" size="20" /></label>
         </p>
         <p>
-                <label for="user_email"><?php _e('E-mail') ?><br />
+                <label for="user_email"><?php _e('Email') ?><br />
                 <input type="text" 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
          */
         do_action( 'register_form' );
         ?>
-        <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
+        <p id="reg_passmail"><?php _e('A password will be emailed to you.') ?></p>
         <br class="clear" />
         <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
         <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button button-primary button-large" value="<?php esc_attr_e('Register'); ?>" /></p>
@@ -802 +801 @@
                 elseif  ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] )
                         $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 experience the awesomeness.' ), 'message' );
         }