WordPress.org

Make WordPress Core

Changeset 33774


Ignore:
Timestamp:
08/28/2015 03:16:02 AM (6 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.

Location:
trunk/src
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/comment.php

    r33436 r33774  
    167167<?php if ( $comment->comment_author_email ) { ?>
    168168<tr>
    169 <th scope="row"><?php _e('E-mail'); ?></th>
     169<th scope="row"><?php _e('Email'); ?></th>
    170170<td><?php echo $comment->comment_author_email; ?></td>
    171171</tr>
  • trunk/src/wp-admin/edit-form-comment.php

    r33627 r33774  
    3434</tr>
    3535<tr>
    36     <td class="first"><label for="email"><?php _e( 'E-mail:' ); ?></label></td>
     36    <td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
    3737    <td>
    3838        <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
  • trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php

    r33270 r33774  
    147147            'username'   => __( 'Username' ),
    148148            'name'       => __( 'Name' ),
    149             'email'      => __( 'E-mail' ),
     149            'email'      => __( 'Email' ),
    150150            'registered' => _x( 'Registered', 'user' ),
    151151            'blogs'      => __( 'Sites' )
  • trunk/src/wp-admin/includes/class-wp-users-list-table.php

    r33735 r33774  
    271271            'username' => __( 'Username' ),
    272272            'name'     => __( 'Name' ),
    273             'email'    => __( 'E-mail' ),
     273            'email'    => __( 'Email' ),
    274274            'role'     => __( 'Role' ),
    275275            'posts'    => __( 'Posts' )
  • trunk/src/wp-admin/includes/schema.php

    r33729 r33774  
    896896    $site_user = get_user_by( 'email', $email );
    897897    if ( ! is_email( $email ) )
    898         $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) );
     898        $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) );
    899899
    900900    if ( $errors->get_error_code() )
  • trunk/src/wp-admin/includes/template.php

    r33762 r33774  
    492492
    493493        <div class="inside">
    494         <label for="author-email"><?php _e('E-mail') ?></label>
     494        <label for="author-email"><?php _e('Email') ?></label>
    495495        <input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
    496496        </div>
  • trunk/src/wp-admin/includes/user.php

    r33769 r33774  
    150150        $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
    151151
    152     /* checking e-mail address */
     152    /* checking email address */
    153153    if ( empty( $user->user_email ) ) {
    154         $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
     154        $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
    155155    } elseif ( !is_email( $user->user_email ) ) {
    156156        $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
  • trunk/src/wp-admin/install.php

    r33495 r33774  
    173173        <?php endif; ?>
    174174        <tr>
    175             <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
     175            <th scope="row"><label for="admin_email"><?php _e( 'Your Email' ); ?></label></th>
    176176            <td><input name="admin_email" type="email" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
    177177            <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
     
    294294        $public       = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
    295295
    296         // Check e-mail address.
     296        // Check email address.
    297297        $error = false;
    298298        if ( empty( $user_name ) ) {
  • trunk/src/wp-admin/options-discussion.php

    r33264 r33774  
    7979<th scope="row"><?php _e('Other comment settings'); ?></th>
    8080<td><fieldset><legend class="screen-reader-text"><span><?php _e('Other comment settings'); ?></span></legend>
    81 <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>
     81<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>
    8282<br />
    8383<label for="comment_registration">
     
    145145</tr>
    146146<tr>
    147 <th scope="row"><?php _e('E-mail me whenever'); ?></th>
    148 <td><fieldset><legend class="screen-reader-text"><span><?php _e('E-mail me whenever'); ?></span></legend>
     147<th scope="row"><?php _e('Email me whenever'); ?></th>
     148<td><fieldset><legend class="screen-reader-text"><span><?php _e('Email me whenever'); ?></span></legend>
    149149<label for="comments_notify">
    150150<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_option('comments_notify')); ?> />
     
    171171<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>
    172172
    173 <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>
     173<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>
    174174<p>
    175175<textarea name="moderation_keys" rows="10" cols="50" id="moderation_keys" class="large-text code"><?php echo esc_textarea( get_option( 'moderation_keys' ) ); ?></textarea>
     
    180180<th scope="row"><?php _e('Comment Blacklist'); ?></th>
    181181<td><fieldset><legend class="screen-reader-text"><span><?php _e('Comment Blacklist'); ?></span></legend>
    182 <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>
     182<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>
    183183<p>
    184184<textarea name="blacklist_keys" rows="10" cols="50" id="blacklist_keys" class="large-text code"><?php echo esc_textarea( get_option( 'blacklist_keys' ) ); ?></textarea>
     
    236236<td class="defaultavatarpicker"><fieldset><legend class="screen-reader-text"><span><?php _e('Default Avatar'); ?></span></legend>
    237237
    238 <?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 />
     238<?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 />
    239239
    240240<?php
  • trunk/src/wp-admin/options-general.php

    r33329 r33774  
    136136</tr>
    137137<tr>
    138 <th scope="row"><label for="admin_email"><?php _e('E-mail Address') ?> </label></th>
     138<th scope="row"><label for="admin_email"><?php _e('Email Address') ?> </label></th>
    139139<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" />
    140140<p class="description" id="admin-email-description"><?php _e( 'This address is used for admin purposes, like new user notification.' ) ?></p></td>
     
    155155<?php } else { ?>
    156156<tr>
    157 <th scope="row"><label for="new_admin_email"><?php _e('E-mail Address') ?> </label></th>
     157<th scope="row"><label for="new_admin_email"><?php _e('Email Address') ?> </label></th>
    158158<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" />
    159 <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>
     159<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>
    160160<?php
    161161$new_admin_email = get_option( 'new_admin_email' );
    162162if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
    163163<div class="updated inline">
    164 <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>
     164<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>
    165165</div>
    166166<?php endif; ?>
  • trunk/src/wp-admin/options-writing.php

    r32974 r33774  
    2828        'id'      => 'options-postemail',
    2929        'title'   => __( 'Post Via Email' ),
    30         '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>',
     30        '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>',
    3131    ) );
    3232}
     
    114114if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
    115115?>
    116 <h3 class="title"><?php _e('Post via e-mail') ?></h3>
    117 <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>
     116<h3 class="title"><?php _e('Post via email') ?></h3>
     117<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>
    118118
    119119<table class="form-table">
  • trunk/src/wp-admin/user-edit.php

    r33450 r33774  
    397397<table class="form-table">
    398398<tr class="user-email-wrap">
    399     <th><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
     399    <th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
    400400    <td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
    401401    <?php
     
    405405    <p><?php
    406406        printf(
    407             __( 'There is a pending change of your e-mail to %1$s. <a href="%2$s">Cancel</a>' ),
     407            __( 'There is a pending change of your email to %1$s. <a href="%2$s">Cancel</a>' ),
    408408            '<code>' . $new_email['newemail'] . '</code>',
    409409            esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) )
  • trunk/src/wp-admin/user-new.php

    r33732 r33774  
    290290    if ( !is_super_admin() ) {
    291291        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>';
    292         $label = __('E-mail');
     292        $label = __('Email');
    293293        $type  = 'email';
    294294    } else {
    295295        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>';
    296         $label = __('E-mail or Username');
     296        $label = __('Email or Username');
    297297        $type  = 'text';
    298298    }
     
    378378    </tr>
    379379    <tr class="form-field form-required">
    380         <th scope="row"><label for="email"><?php _e('E-mail'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
     380        <th scope="row"><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
    381381        <td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
    382382    </tr>
  • trunk/src/wp-includes/pluggable.php

    r33744 r33774  
    14641464            /* translators: 1: comment author, 2: author IP, 3: author domain */
    14651465            $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    1466             $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
     1466            $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    14671467            $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    14681468            $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
     
    15941594            $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
    15951595            $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
    1596             $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n";
     1596            $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
    15971597            $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
    15981598            $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n";
     
    17071707    $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
    17081708    $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
    1709     $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n";
     1709    $message .= sprintf(__('Email: %s'), $user->user_email) . "\r\n";
    17101710
    17111711    @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
  • trunk/src/wp-includes/theme-compat/comments-popup.php

    r30754 r33774  
    6464<?php if ( comments_open() ) { ?>
    6565<h2><?php _e('Leave a comment'); ?></h2>
    66 <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>
     66<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>
    6767
    6868<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
     
    7777    <p>
    7878      <input type="text" name="email" id="email" value="<?php echo esc_attr( $commenter['comment_author_email'] ); ?>" size="28" tabindex="2" />
    79        <label for="email"><?php _e('E-mail'); ?></label>
     79       <label for="email"><?php _e('Email'); ?></label>
    8080    </p>
    8181
  • trunk/src/wp-includes/user-functions.php

    r33771 r33774  
    19511951    }
    19521952
    1953     // Check the e-mail address
     1953    // Check the email address
    19541954    if ( $user_email == '' ) {
    1955         $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) );
     1955        $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );
    19561956    } elseif ( ! is_email( $user_email ) ) {
    19571957        $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
  • trunk/src/wp-login.php

    r33474 r33774  
    282282
    283283    if ( empty( $_POST['user_login'] ) ) {
    284         $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
     284        $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or email address.'));
    285285    } elseif ( strpos( $_POST['user_login'], '@' ) ) {
    286286        $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
     
    303303
    304304    if ( !$user_data ) {
    305         $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or e-mail.'));
     305        $errors->add('invalidcombo', __('<strong>ERROR</strong>: Invalid username or email.'));
    306306        return $errors;
    307307    }
     
    408408
    409409    if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
    410         wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
     410        wp_die( __('The email could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );
    411411
    412412    return true;
     
    561561<form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
    562562    <p>
    563         <label for="user_login" ><?php _e('Username or E-mail:') ?><br />
     563        <label for="user_login" ><?php _e('Username or Email:') ?><br />
    564564        <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
    565565    </p>
     
    749749    </p>
    750750    <p>
    751         <label for="user_email"><?php _e('E-mail') ?><br />
     751        <label for="user_email"><?php _e('Email') ?><br />
    752752        <input type="email" name="user_email" id="user_email" class="input" value="<?php echo esc_attr( wp_unslash( $user_email ) ); ?>" size="25" /></label>
    753753    </p>
    754754    <?php
    755755    /**
    756      * Fires following the 'E-mail' field in the user registration form.
     756     * Fires following the 'Email' field in the user registration form.
    757757     *
    758758     * @since 2.1.0
     
    760760    do_action( 'register_form' );
    761761    ?>
    762     <p id="reg_passmail"><?php _e( 'Registration confirmation will be e-mailed to you.' ); ?></p>
     762    <p id="reg_passmail"><?php _e( 'Registration confirmation will be emailed to you.' ); ?></p>
    763763    <br class="clear" />
    764764    <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
     
    873873            $errors->add('registerdisabled', __('User registration is currently not allowed.'));
    874874        elseif  ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )
    875             $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
     875            $errors->add('confirm', __('Check your email for the confirmation link.'), 'message');
    876876        elseif  ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )
    877             $errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
     877            $errors->add('newpass', __('Check your email for your new password.'), 'message');
    878878        elseif  ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )
    879             $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
     879            $errors->add('registered', __('Registration complete. Please check your email.'), 'message');
    880880        elseif ( strpos( $redirect_to, 'about.php?updated' ) )
    881881            $errors->add('updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what&#8217;s new.' ), 'message' );
Note: See TracChangeset for help on using the changeset viewer.