Ticket #26156: 26156.2.diff

src/wp-admin/comment.php

@@ -166 +166 @@
 </tr>
 <?php if ( $comment->comment_author_email ) { ?>
 <tr>
-<th scope="row"><?php _e('E-mail'); ?></th>
+<th scope="row"><?php _e('Email'); ?></th>
 <td><?php echo $comment->comment_author_email; ?></td>
 </tr>
 <?php } ?>

src/wp-admin/edit-form-comment.php

@@ -33 +33 @@
         <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
 </tr>
 <tr>
-        <td class="first"><label for="email"><?php _e( 'E-mail:' ); ?></label></td>
+        <td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
         <td>
                 <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
         </td>

src/wp-admin/includes/class-wp-ms-users-list-table.php

@@ -146 +146 @@
                         'cb'         => '<input type="checkbox" />',
                         'username'   => __( 'Username' ),
                         'name'       => __( 'Name' ),
-                        'email'      => __( 'E-mail' ),
+                        'email'      => __( 'Email' ),
                         'registered' => _x( 'Registered', 'user' ),
                         'blogs'      => __( 'Sites' )
                 );

src/wp-admin/includes/class-wp-users-list-table.php

@@ -270 +270 @@
                         'cb'       => '<input type="checkbox" />',
                         'username' => __( 'Username' ),
                         'name'     => __( 'Name' ),
-                        'email'    => __( 'E-mail' ),
+                        'email'    => __( 'Email' ),
                         'role'     => __( 'Role' ),
                         'posts'    => __( 'Posts' )
                 );

src/wp-admin/includes/schema.php

@@ -895 +895 @@
 
         $site_user = get_user_by( 'email', $email );
         if ( ! is_email( $email ) )
-                $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
+                $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
 
         if ( $errors->get_error_code() )
                 return $errors;

src/wp-admin/includes/template.php

@@ -491 +491 @@
                 </div>
 
                 <div class="inside">
-                <label for="author-email"><?php _e('E-mail') ?></label>
+                <label for="author-email"><?php _e('Email') ?></label>
                 <input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
                 </div>
 

src/wp-admin/includes/user.php

@@ -149 +149 @@
         if ( !$update && username_exists( $user->user_login ) )
                 $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
 
-        /* checking e-mail address */
+        /* checking email address */
         if ( empty( $user->user_email ) ) {
-                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail 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' ) );
         } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {

src/wp-admin/install.php

@@ -172 +172 @@
                 </tr>
                 <?php endif; ?>
                 <tr>
-                        <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
+                        <th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
                         <td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
                         <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
                 </tr>
@@ -293 +293 @@
                 $admin_email  = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
                 $public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
 
-                // Check e-mail address.
+                // Check email address.
                 $error = false;
                 if ( empty( $user_name ) ) {
                         // TODO: poka-yoke

src/wp-admin/options-discussion.php

@@ -78 +78 @@
 <tr>
 <th scope="row"><?php _e('Other comment settings'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
-<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail'); ?></label>
+<label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_option('require_name_email')); ?> /> <?php _e('Comment author must fill out name and email'); ?></label>
 <br />
 <label for="comment_registration">
 <input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_option('comment_registration')); ?> />
@@ -144 +144 @@
 </fieldset></td>
 </tr>
 <tr>
-<th scope="row"><?php _e('E-mail me whenever'); ?></th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
+<th scope="row"><?php _e('Email me whenever'); ?></th>
+<td><fieldset><legend class="screen-reader-text"><span><?php _e('Email me whenever'); ?></span></legend>
 <label for="comments_notify">
 <input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
 <?php _e('Anyone posts a comment'); ?> </label>
@@ -170 +170 @@
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Moderation'); ?></span></legend>
 <p><label for="comment_max_links"><?php printf(__('Hold a comment in the queue if it contains %s or more links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="number" step="1" min="0" id="comment_max_links" value="' . esc_attr(get_option('comment_max_links')) . '" class="small-text" />' ); ?></label></p>
 
-<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<p><label for="moderation_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be held in the <a href="edit-comments.php?comment_status=moderated">moderation queue</a>. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
 <textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
 </p>
@@ -179 +179 @@
 <tr>
 <th scope="row"><?php _e('Comment Blacklist'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
-<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, e-mail, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
+<p><label for="blacklist_keys"><?php _e('When a comment contains any of these words in its content, name, URL, email, or IP, it will be marked as spam. One word or IP per line. It will match inside words, so &#8220;press&#8221; will match &#8220;WordPress&#8221;.'); ?></label></p>
 <p>
 <textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
 </p>
@@ -235 +235 @@
 <th scope="row"><?php _e('Default Avatar'); ?></th>
 <td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
 
-<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their e-mail address.'); ?><br />
+<?php _e('For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address.'); ?><br />
 
 <?php
 $avatar_defaults = array(

src/wp-admin/options-general.php

@@ -135 +135 @@
 <p class="description" id="home-description"><?php _e( 'Enter the address here if you <a href="https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">want your site home page to be different from your WordPress installation directory.</a>' ); ?></p></td>
 </tr>
 <tr>
-<th scope="row"><label for="admin_email"><?php _e('E-mail Address') ?> </label></th>
+<th scope="row"><label for="admin_email"><?php _e('Email Address') ?> </label></th>
 <td><input name="admin_email" type="email" id="admin_email" aria-describedby="admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
 <p class="description" id="admin-email-description"><?php _e( 'This address is used for admin purposes, like new user notification.' ) ?></p></td>
 </tr>
@@ -154 +154 @@
 </tr>
 <?php } else { ?>
 <tr>
-<th scope="row"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></th>
+<th scope="row"><label for="new_admin_email"><?php _e('Email Address') ?> </label></th>
 <td><input name="new_admin_email" type="email" id="new_admin_email" aria-describedby="new-admin-email-description" value="<?php form_option( 'admin_email' ); ?>" class="regular-text ltr" />
-<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an e-mail at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ) ?></p>
+<p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ) ?></p>
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
 if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
 <div class="updated inline">
-<p><?php printf( __('There is a pending change of the admin e-mail to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
+<p><?php printf( __('There is a pending change of the admin email to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
 </div>
 <?php endif; ?>
 </td>

src/wp-admin/options-writing.php

@@ -27 +27 @@
         get_current_screen()->add_help_tab( array(
                 'id'      => 'options-postemail',
                 'title'   => __( 'Post Via Email' ),
-                'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
+                'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.' ) . '</p>',
         ) );
 }
 
@@ -113 +113 @@
 /** This filter is documented in wp-admin/options.php */
 if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
 ?>
-<h3 class="title"><?php _e('Post via e-mail') ?></h3>
-<p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
+<h3 class="title"><?php _e('Post via email') ?></h3>
+<p><?php printf(__('To post to WordPress by email you must set up a secret email account with POP3 access. Any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
 
 <table class="form-table">
 <tr>

src/wp-admin/user-edit.php

@@ -396 +396 @@
 
 <table class="form-table">
 <tr class="user-email-wrap">
-        <th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
+        <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
         <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
         <?php
         $new_email = get_option( $current_user->ID . '_new_email' );
@@ -404 +404 @@
         <div class="updated inline">
         <p><?php
                 printf(
-                        __( 'There is a pending change of your e-mail to %1$s. <a href="%2$s">Cancel</a>' ),
+                        __( 'There is a pending change of your email to %1$s. <a href="%2$s">Cancel</a>' ),
                         '<code>' . $new_email['newemail'] . '</code>',
                         esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) )
         ); ?></p>

src/wp-admin/user-new.php

@@ -289 +289 @@
                 echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
         if ( !is_super_admin() ) {
                 echo '<p>' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
-                $label = __('E-mail');
+                $label = __('Email');
                 $type  = 'email';
         } else {
                 echo '<p>' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '</p>';
-                $label = __('E-mail or Username');
+                $label = __('Email or Username');
                 $type  = 'text';
         }
 ?>
@@ -377 +377 @@
                 <td><input name="user_login" type="text" id="user_login" value="<?php echo esc_attr( $new_user_login ); ?>" aria-required="true" autocapitalize="none" autocorrect="off" /></td>
         </tr>
         <tr class="form-field form-required">
-                <th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
+                <th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
                 <td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
         </tr>
 <?php if ( !is_multisite() ) { ?>

src/wp-includes/pluggable.php

@@ -1463 +1463 @@
                         $notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
                         /* translators: 1: comment author, 2: author IP, 3: author domain */
                         $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
+                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
                         $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
                         $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
@@ -1593 +1593 @@
                         $notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
                         $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
                         $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-                        $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
+                        $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
                         $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
                         $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
                         break;
@@ -1706 +1706 @@
 
         $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
         $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
-        $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
+        $message .= sprintf(__('Email: %s'), $user->user_email) . "\r\n";
 
         @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
 

src/wp-includes/theme-compat/comments-popup.php

@@ -63 +63 @@
 
 <?php if ( comments_open() ) { ?>
 <h2><?php _e('Leave a comment'); ?></h2>
-<p><?php printf(__('Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
+<p><?php printf(__('Line and paragraph breaks automatic, email address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code>%s</code>'), allowed_tags()); ?></p>
 
 <form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
 <?php if ( $user_ID ) : ?>
@@ -76 +76 @@
 
         <p>
           <input type="text" name="email" id="email" value="<?php echo esc_attr( $commenter['comment_author_email'] ); ?>" size="28" tabindex="2" />
-           <label for="email"><?php _e('E-mail'); ?></label>
+           <label for="email"><?php _e('Email'); ?></label>
         </p>
 
         <p>

src/wp-includes/user-functions.php

@@ -1950 +1950 @@
                 $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
         }
 
-        // Check the e-mail address
+        // Check the email address
         if ( $user_email == '' ) {
-                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) );
+                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );
         } elseif ( ! is_email( $user_email ) ) {
                 $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
                 $user_email = '';

src/wp-login.php

@@ -281 +281 @@
         $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.'));
         } elseif ( strpos( $_POST['user_login'], '@' ) ) {
                 $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
                 if ( empty( $user_data ) )
@@ -302 +302 @@
                 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;
         }
 
@@ -407 +407 @@
         $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data );
 
         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;
 }
@@ -560 +560 @@
 
 <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>
         <?php
@@ -748 +748 @@
                 <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="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
          */
         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 ); ?>" />
         <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>
@@ -872 +872 @@
                 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 see what&#8217;s new.' ), 'message' );
         }