Ticket #14366: email.diff

File email.diff, 79.9 KB (added by niallkennedy, 3 years ago)

Replace email with e-mail

  • wp-signup.php

     
    136136        _e( '(Must be at least 4 characters, letters and numbers only.)' ); 
    137137        ?> 
    138138 
    139         <label for="user_email"><?php _e( 'Email&nbsp;Address:' ) ?></label> 
     139        <label for="user_email"><?php _e( 'E-mail&nbsp;Address:' ) ?></label> 
    140140        <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?> 
    141141                <p class="error"><?php echo $errmsg ?></p> 
    142142        <?php } ?> 
    143         <input name="user_email" type="text" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration email to this address. (Double-check your email address before continuing.)') ?> 
     143        <input name="user_email" type="text" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('We send your registration e-mail to this address. (Double-check your e-mail address before continuing.)') ?> 
    144144        <?php 
    145145        if ( $errmsg = $errors->get_error_message('generic') ) { 
    146146                echo '<p class="error">' . $errmsg . '</p>'; 
    … …  
    366366        <p><?php _e( 'But, before you can start using your site, <strong>you must activate it</strong>.' ) ?></p> 
    367367        <p><?php printf( __( 'Check your inbox at <strong>%s</strong> and click the link given.' ),  $user_email) ?></p> 
    368368        <p><?php _e( 'If you do not activate your site within two days, you will have to sign up again.' ); ?></p> 
    369         <h2><?php _e( 'Still waiting for your email?' ); ?></h2> 
     369        <h2><?php _e( 'Still waiting for your e-mail message?' ); ?></h2> 
    370370        <p> 
    371                 <?php _e( 'If you haven&#8217;t received your email yet, there are a number of things you can do:' ) ?> 
     371                <?php _e( 'If you haven&#8217;t received your e-mail message yet, there are a number of things you can do:' ) ?> 
    372372                <ul id="noemail-tips"> 
    373                         <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li> 
    374                         <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li> 
    375                         <li><?php printf( __( 'Have you entered your email correctly?  You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li> 
     373                        <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of an e-mail message can be delayed by processes outside of our control.' ) ?></strong></p></li> 
     374                        <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime e-mail messages wind up there by mistake.' ) ?></p></li> 
     375                        <li><?php printf( __( 'Have you entered your e-mail address correctly?  You have entered %s, if it&#8217;s incorrect, you will not receive your e-mail message.' ), $user_email ) ?></li> 
    376376                </ul> 
    377377        </p> 
    378378        <?php 

  • wp-comments-post.php

     
    7777        if ( 6 > strlen($comment_author_email) || '' == $comment_author ) 
    7878                wp_die( __('Error: please fill the required fields (name, email).') ); 
    7979        elseif ( !is_email($comment_author_email)) 
    80                 wp_die( __('Error: please enter a valid email address.') ); 
     80                wp_die( __('Error: please enter a valid e-mail address.') ); 
    8181} 
    8282 
    8383if ( '' == $comment_content ) 

  • wp-login.php

     
    131131} 
    132132 
    133133/** 
    134  * Handles sending password retrieval email to user. 
     134 * Handles sending password retrieval e-mail message to user. 
    135135 * 
    136136 * @uses $wpdb WordPress Database object 
    137137 * 
    … …  
    148148        if ( strpos($_POST['user_login'], '@') ) { 
    149149                $user_data = get_user_by_email(trim($_POST['user_login'])); 
    150150                if ( empty($user_data) ) 
    151                         $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.')); 
     151                        $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that e-mail address.')); 
    152152        } else { 
    153153                $login = trim($_POST['user_login']); 
    154154                $user_data = get_userdatabylogin($login); 
    … …  
    164164                return $errors; 
    165165        } 
    166166 
    167         // redefining user_login ensures we return the right case in the email 
     167        // redefining user_login ensures we return the right case in the e-mail 
    168168        $user_login = $user_data->user_login; 
    169169        $user_email = $user_data->user_email; 
    170170 
    … …  
    189189        $message = __('Someone has asked to reset the password for the following site and username.') . "\r\n\r\n"; 
    190190        $message .= network_site_url() . "\r\n\r\n"; 
    191191        $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; 
    192         $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; 
     192        $message .= __('To reset your password visit the following address, otherwise just ignore this e-mail message and nothing will happen.') . "\r\n\r\n"; 
    193193        $message .= network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user_login), 'login') . "\r\n"; 
    194194 
    195195        if ( is_multisite() ) 
    196196                $blogname = $GLOBALS['current_site']->site_name; 
    197197        else 
    198198                // The blogname option is escaped with esc_html on the way into the database in sanitize_option 
    199                 // we want to reverse this for the plain text arena of emails. 
     199                // we want to reverse this for the plain text arena of e-mails. 
    200200                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 
    201201 
    202202        $title = sprintf( __('[%s] Password Reset'), $blogname ); 
    … …  
    248248                $blogname = $GLOBALS['current_site']->site_name; 
    249249        else 
    250250                // The blogname option is escaped with esc_html on the way into the database in sanitize_option 
    251                 // we want to reverse this for the plain text arena of emails. 
     251                // we want to reverse this for the plain text arena of e-mails. 
    252252                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 
    253253 
    254254        $title = sprintf( __('[%s] Your new password'), $blogname ); 
    … …  
    268268 * Handles registering a new user. 
    269269 * 
    270270 * @param string $user_login User's username for logging in 
    271  * @param string $user_email User's email address to send password and add 
     271 * @param string $user_email User's e-mail address to send password and add 
    272272 * @return int|WP_Error Either user's ID or error on failure. 
    273273 */ 
    274274function register_new_user( $user_login, $user_email ) { 
    … …  
    291291        if ( $user_email == '' ) { 
    292292                $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your e-mail address.' ) ); 
    293293        } elseif ( ! is_email( $user_email ) ) { 
    294                 $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) ); 
     294                $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ) ); 
    295295                $user_email = ''; 
    296296        } elseif ( email_exists( $user_email ) ) { 
    297                 $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) ); 
     297                $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This e-mail is already registered, please choose another one.' ) ); 
    298298        } 
    299299 
    300300        do_action( 'register_post', $sanitized_user_login, $user_email, $errors ); 

  • wp-includes/comment.php

     
    2929 * @uses $wpdb 
    3030 * 
    3131 * @param string $author Comment Author's name 
    32  * @param string $email Comment Author's email 
     32 * @param string $email Comment Author's e-mail address 
    3333 * @param string $url Comment Author's URL 
    3434 * @param string $comment Comment contents 
    3535 * @param string $user_ip Comment Author's IP address 
    … …  
    599599 *              last comment timestamp and new comment timestamp. 
    600600 * 
    601601 * @param string $ip Comment IP. 
    602  * @param string $email Comment author email address. 
     602 * @param string $email Comment author e-mail address. 
    603603 * @param string $date MySQL time string. 
    604604 */ 
    605605function check_comment_flood_db( $ip, $email, $date ) { 
    … …  
    757757 * @uses do_action() Calls 'wp_blacklist_check' hook for all parameters. 
    758758 * 
    759759 * @param string $author The author of the comment 
    760  * @param string $email The email of the comment 
     760 * @param string $email The e-mail address of the author of the comment 
    761761 * @param string $url The url used in the comment 
    762762 * @param string $comment The comment content 
    763763 * @param string $user_ip The comment author IP address 
    … …  
    11021102} 
    11031103 
    11041104/** 
    1105  * Get current commenter's name, email, and URL. 
     1105 * Get current commenter's name, e-mail address, and URL. 
    11061106 * 
    11071107 * Expects cookies content to already be sanitized. User of this function might 
    11081108 * wish to recheck the returned array for validity. 
    … …  
    11111111 * 
    11121112 * @since 2.0.4 
    11131113 * 
    1114  * @return array Comment author, email, url respectively. 
     1114 * @return array Comment author, e-mail address, url respectively. 
    11151115 */ 
    11161116function wp_get_current_commenter() { 
    11171117        // Cookies should already be sanitized. 
    … …  
    11921192 * @uses apply_filters() Calls 'pre_comment_content' hook on the comment's content 
    11931193 * @uses apply_filters() Calls 'pre_comment_user_ip' hook on comment author's IP 
    11941194 * @uses apply_filters() Calls 'pre_comment_author_url' hook on comment author's URL 
    1195  * @uses apply_filters() Calls 'pre_comment_author_email' hook on comment author's email address 
     1195 * @uses apply_filters() Calls 'pre_comment_author_email' hook on comment author's e-mail address 
    11961196 * 
    11971197 * @param array $commentdata Contains information on the comment. 
    11981198 * @return array Parsed comment information. 

  • wp-includes/registration.php

     
    2222} 
    2323 
    2424/** 
    25  * Checks whether the given email exists. 
     25 * Checks whether the given e-mail address exists. 
    2626 * 
    2727 * @since 2.1.0 
    2828 * @uses $wpdb 
    2929 * 
    30  * @param string $email Email. 
     30 * @param string $email E-mail address. 
    3131 * @return bool|int The user's ID on success, and false on failure. 
    3232 */ 
    3333function email_exists( $email ) { 
    … …  
    7474 * 'user_nicename' - A string that contains a nicer looking name for the user. 
    7575 *              The default is the user's username. 
    7676 * 'user_url' - A string containing the user's URL for the user's web site. 
    77  * 'user_email' - A string containing the user's email address. 
     77 * 'user_email' - A string containing the user's e-mail address. 
    7878 * 'display_name' - A string that will be shown on the site. Defaults to user's 
    7979 *              username. It is likely that you will want to change this, for both 
    8080 *              appearance and security through obscurity (that is if you don't use and 
    … …  
    141141        $user_email = apply_filters('pre_user_email', $user_email); 
    142142 
    143143        if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) ) 
    144                 return new WP_Error('existing_user_email', __('This email address is already registered.') ); 
     144                return new WP_Error('existing_user_email', __('This e-mail address is already registered.') ); 
    145145 
    146146        if ( empty($display_name) ) 
    147147                $display_name = $user_login; 
    … …  
    292292/** 
    293293 * A simpler way of inserting an user into the database. 
    294294 * 
    295  * Creates a new user with just the username, password, and email. For a more 
     295 * Creates a new user with just the username, password, and e-mail address. For a more 
    296296 * detail creation of a user, use wp_insert_user() to specify more infomation. 
    297297 * 
    298298 * @since 2.0.0 
    … …  
    300300 * 
    301301 * @param string $username The user's username. 
    302302 * @param string $password The user's password. 
    303  * @param string $email The user's email (optional). 
     303 * @param string $email The user's e-mail address (optional). 
    304304 * @return int The new user's ID. 
    305305 */ 
    306306function wp_create_user($username, $password, $email = '') { 

  • wp-includes/comment-template.php

     
    4949} 
    5050 
    5151/** 
    52  * Retrieve the email of the author of the current comment. 
     52 * Retrieve the e-mail address of the author of the current comment. 
    5353 * 
    5454 * @since 1.5.0 
    55  * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author email 
     55 * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author e-mail address 
    5656 * @uses $comment 
    5757 * 
    58  * @param int $comment_ID The ID of the comment for which to get the author's email.  Optional. 
    59  * @return string The current comment author's email 
     58 * @param int $comment_ID The ID of the comment for which to get the author's e-mail address.  Optional. 
     59 * @return string The current comment author's e-mail address 
    6060 */ 
    6161function get_comment_author_email( $comment_ID = 0 ) { 
    6262        $comment = get_comment( $comment_ID ); 
    … …  
    6464} 
    6565 
    6666/** 
    67  * Display the email of the author of the current global $comment. 
     67 * Display the e-mail address of the author of the current global $comment. 
    6868 * 
    69  * Care should be taken to protect the email address and assure that email 
    70  * harvesters do not capture your commentors' email address. Most assume that 
    71  * their email address will not appear in raw form on the blog. Doing so will 
    72  * enable anyone, including those that people don't want to get the email 
     69 * Care should be taken to protect the e-mail address and assure that e-mail 
     70 * harvesters do not capture your commentors' e-mail address. Most assume that 
     71 * their e-mail address will not appear in raw form on the blog. Doing so will 
     72 * enable anyone, including those that people don't want to get the e-mail 
    7373 * address and use it for their own means good and bad. 
    7474 * 
    7575 * @since 0.71 
    76  * @uses apply_filters() Calls 'author_email' hook on the author email 
     76 * @uses apply_filters() Calls 'author_email' hook on the author e-mail address 
    7777 * 
    78  * @param int $comment_ID The ID of the comment for which to print the author's email. Optional. 
     78 * @param int $comment_ID The ID of the comment for which to print the author's email address. Optional. 
    7979 */ 
    8080function comment_author_email( $comment_ID = 0 ) { 
    8181        echo apply_filters('author_email', get_comment_author_email( $comment_ID ) ); 
    8282} 
    8383 
    8484/** 
    85  * Display the html email link to the author of the current comment. 
     85 * Display the html e-mail link to the author of the current comment. 
    8686 * 
    87  * Care should be taken to protect the email address and assure that email 
    88  * harvesters do not capture your commentors' email address. Most assume that 
    89  * their email address will not appear in raw form on the blog. Doing so will 
    90  * enable anyone, including those that people don't want to get the email 
     87 * Care should be taken to protect the e-mail address and assure that e-mail 
     88 * harvesters do not capture your commentors' e-mail address. Most assume that 
     89 * their e-mail address will not appear in raw form on the blog. Doing so will 
     90 * enable anyone, including those that people don't want to get the e-mail 
    9191 * address and use it for their own means good and bad. 
    9292 * 
    9393 * @since 0.71 
    94  * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's email 
     94 * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's e-mail address 
    9595 * @uses get_comment_author_email_link() For generating the link 
    9696 * @global object $comment The current Comment row object 
    9797 * 
    98  * @param string $linktext The text to display instead of the comment author's email address 
    99  * @param string $before The text or HTML to display before the email link. 
    100  * @param string $after The text or HTML to display after the email link. 
     98 * @param string $linktext The text to display instead of the comment author's e-mail address 
     99 * @param string $before The text or HTML to display before the e-mail link. 
     100 * @param string $after The text or HTML to display after the e-mail link. 
    101101 */ 
    102102function comment_author_email_link($linktext='', $before='', $after='') { 
    103103        if ( $link = get_comment_author_email_link( $linktext, $before, $after ) ) 
    … …  
    105105} 
    106106 
    107107/** 
    108  * Return the html email link to the author of the current comment. 
     108 * Return the html e-mail link to the author of the current comment. 
    109109 * 
    110  * Care should be taken to protect the email address and assure that email 
    111  * harvesters do not capture your commentors' email address. Most assume that 
    112  * their email address will not appear in raw form on the blog. Doing so will 
    113  * enable anyone, including those that people don't want to get the email 
     110 * Care should be taken to protect the e-mail address and assure that e-mail 
     111 * harvesters do not capture your commentors' e-mail address. Most assume that 
     112 * their e-mail address will not appear in raw form on the blog. Doing so will 
     113 * enable anyone, including those that people don't want to get the e-mail 
    114114 * address and use it for their own means good and bad. 
    115115 * 
    116116 * @since 2.7 
    117  * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's email 
     117 * @uses apply_filters() Calls 'comment_email' hook for the display of the comment author's e-mail address 
    118118 * @global object $comment The current Comment row object 
    119119 * 
    120  * @param string $linktext The text to display instead of the comment author's email address 
    121  * @param string $before The text or HTML to display before the email link. 
    122  * @param string $after The text or HTML to display after the email link. 
     120 * @param string $linktext The text to display instead of the comment author's e-mail address 
     121 * @param string $before The text or HTML to display before the e-mail link. 
     122 * @param string $after The text or HTML to display after the e-mail link. 
    123123 */ 
    124124function get_comment_author_email_link($linktext='', $before='', $after='') { 
    125125        global $comment; 
    … …  
    237237 * @since 1.5.0 
    238238 * @uses apply_filters() Calls the 'get_comment_author_url_link' on the complete HTML before returning. 
    239239 * 
    240  * @param string $linktext The text to display instead of the comment author's email address 
    241  * @param string $before The text or HTML to display before the email link. 
    242  * @param string $after The text or HTML to display after the email link. 
     240 * @param string $linktext The text to display instead of the comment author's e-mail address 
     241 * @param string $before The text or HTML to display before the e-mail link. 
     242 * @param string $after The text or HTML to display after the e-mail link. 
    243243 * @return string The HTML link between the $before and $after parameters 
    244244 */ 
    245245function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) { 
    … …  
    259259 * @since 0.71 
    260260 * @see get_comment_author_url_link() Echoes result 
    261261 * 
    262  * @param string $linktext The text to display instead of the comment author's email address 
    263  * @param string $before The text or HTML to display before the email link. 
    264  * @param string $after The text or HTML to display after the email link. 
     262 * @param string $linktext The text to display instead of the comment author's e-mail address 
     263 * @param string $before The text or HTML to display before the e-mail link. 
     264 * @param string $after The text or HTML to display after the e-mail link. 
    265265 */ 
    266266function comment_author_url_link( $linktext = '', $before = '', $after = '' ) { 
    267267        echo get_comment_author_url_link( $linktext, $before, $after ); 
    … …  
    876876        $comment_author = $commenter['comment_author']; // Escaped by sanitize_comment_cookies() 
    877877 
    878878        /** 
    879          * The email address of the current comment author escaped for use in attributes. 
     879         * The e-mail address of the current comment author escaped for use in attributes. 
    880880         */ 
    881881        $comment_author_email = $commenter['comment_author_email'];  // Escaped by sanitize_comment_cookies() 
    882882 
    … …  
    15261526        $fields =  array( 
    15271527                'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . 
    15281528                            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></p>', 
    1529                 'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . 
     1529                'email'  => '<p class="comment-form-email"><label for="email">' . __( 'E-mail' ) . '</label> ' . ( $req ? '<span class="required">*</span>' : '' ) . 
    15301530                            '<input id="email" name="email" type="text" value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>', 
    15311531                'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label>' . 
    15321532                            '<input id="url" name="url" type="text" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>', 
    … …  
    15381538                'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>', 
    15391539                'must_log_in'          => '<p class="must-log-in">' .  sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>', 
    15401540                'logged_in_as'         => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>', 
    1541                 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>', 
     1541                'comment_notes_before' => '<p class="comment-notes">' . __( 'Your e-mail address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>', 
    15421542                'comment_notes_after'  => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>', 
    15431543                'id_form'              => 'commentform', 
    15441544                'id_submit'            => 'submit', 

  • wp-includes/user.php

     
    517517 * @global string $user_login The user username for logging in 
    518518 * @global int $user_level The level of the user 
    519519 * @global int $user_ID The ID of the user 
    520  * @global string $user_email The email address of the user 
     520 * @global string $user_email The e-mail address of the user 
    521521 * @global string $user_url The url in the user's profile 
    522522 * @global string $user_pass_md5 MD5 of the user's password 
    523523 * @global string $user_identity The display name of the user 

  • wp-includes/formatting.php

     
    12571257} 
    12581258 
    12591259/** 
    1260  * Converts email addresses characters to HTML entities to block spam bots. 
     1260 * Converts an e-mail address characters to HTML entities to block spam bots. 
    12611261 * 
    12621262 * @since 0.71 
    12631263 * 
    1264  * @param string $emailaddy Email address. 
     1264 * @param string $emailaddy E-mail address. 
    12651265 * @param int $mailto Optional. Range from 0 to 1. Used for encoding. 
    1266  * @return string Converted email address. 
     1266 * @return string Converted e-mail address. 
    12671267 */ 
    12681268function antispambot($emailaddy, $mailto=0) { 
    12691269        $emailNOSPAMaddy = ''; 
    … …  
    13331333} 
    13341334 
    13351335/** 
    1336  * Callback to convert email address match to HTML A element. 
     1336 * Callback to convert e-mail address match to HTML A element. 
    13371337 * 
    13381338 * This function was backported from 2.5.0 to 2.3.2. Regex callback for {@link 
    13391339 * make_clickable()}. 
    … …  
    13421342 * @access private 
    13431343 * 
    13441344 * @param array $matches Single Regex Match. 
    1345  * @return string HTML A element with email address. 
     1345 * @return string HTML A element with e-mail address. 
    13461346 */ 
    13471347function _make_email_clickable_cb($matches) { 
    13481348        $email = $matches[2] . '@' . $matches[3]; 
    … …  
    13521352/** 
    13531353 * Convert plaintext URI to HTML links. 
    13541354 * 
    1355  * Converts URI, www and ftp, and email addresses. Finishes by fixing links 
     1355 * Converts URI, www and ftp, and e-mail addresses. Finishes by fixing links 
    13561356 * within links. 
    13571357 * 
    13581358 * @since 0.71 
    … …  
    14691469} 
    14701470 
    14711471/** 
    1472  * Verifies that an email is valid. 
     1472 * Verifies that an e-mail address is valid. 
    14731473 * 
    14741474 * Does not grok i18n domains. Not RFC compliant. 
    14751475 * 
    14761476 * @since 0.71 
    14771477 * 
    1478  * @param string $email Email address to verify. 
     1478 * @param string $email E-mail address to verify. 
    14791479 * @param boolean $deprecated. Deprecated. 
    1480  * @return string|bool Either false or the valid email address. 
     1480 * @return string|bool Either false or the valid e-mail address. 
    14811481 */ 
    14821482function is_email( $email, $deprecated = false ) { 
    14831483        if ( ! empty( $deprecated ) ) 
    14841484                _deprecated_argument( __FUNCTION__, '3.0' ); 
    14851485 
    1486         // Test for the minimum length the email can be 
     1486        // Test for the minimum length the e-mail can be 
    14871487        if ( strlen( $email ) < 3 ) { 
    14881488                return apply_filters( 'is_email', false, $email, 'email_too_short' ); 
    14891489        } 
    … …  
    15341534                } 
    15351535        } 
    15361536 
    1537         // Congratulations your email made it! 
     1537        // Congratulations your e-mail address made it! 
    15381538        return apply_filters( 'is_email', $email, $email, null ); 
    15391539} 
    15401540 
    15411541/** 
    1542  * Convert to ASCII from email subjects. 
     1542 * Convert to ASCII from e-mail message subjects. 
    15431543 * 
    15441544 * @since 1.2.0 
    1545  * @usedby wp_mail() handles charsets in email subjects 
     1545 * @usedby wp_mail() handles charsets in e-mail message subjects 
    15461546 * 
    15471547 * @param string $string Subject line 
    15481548 * @return string Converted string to ASCII 
    … …  
    16851685} 
    16861686 
    16871687/** 
    1688  * Strips out all characters that are not allowable in an email. 
     1688 * Strips out all characters that are not allowable in an e-mail address. 
    16891689 * 
    16901690 * @since 1.5.0 
    16911691 * 
    1692  * @param string $email Email address to filter. 
    1693  * @return string Filtered email address. 
     1692 * @param string $email E-mail address to filter. 
     1693 * @return string Filtered e-mail address. 
    16941694 */ 
    16951695function sanitize_email( $email ) { 
    1696         // Test for the minimum length the email can be 
     1696        // Test for the minimum length the e-mail can be 
    16971697        if ( strlen( $email ) < 3 ) { 
    16981698                return apply_filters( 'sanitize_email', '', $email, 'email_too_short' ); 
    16991699        } 
    … …  
    17591759        // Join valid subs into the new domain 
    17601760        $domain = join( '.', $new_subs ); 
    17611761 
    1762         // Put the email back together 
     1762        // Put the e-mail address back together 
    17631763        $email = $local . '@' . $domain; 
    17641764 
    17651765        // Congratulations your email made it! 
    … …  
    23872387                        if ( !is_email($value) ) { 
    23882388                                $value = get_option( $option ); // Resets option to stored value in the case of failed sanitization 
    23892389                                if ( function_exists('add_settings_error') ) 
    2390                                         add_settings_error('admin_email', 'invalid_admin_email', __('The email address entered did not appear to be a valid email address. Please enter a valid email address.')); 
     2390                                        add_settings_error('admin_email', 'invalid_admin_email', __('The e-mail address entered did not appear to be a valid e-mail address. Please enter a valid e-mail address.')); 
    23912391                        } 
    23922392                        break; 
    23932393 

  • wp-includes/deprecated.php

     
    12281228 * 
    12291229 * @param string $username The user's username. 
    12301230 * @param string $password The user's password. 
    1231  * @param string $email The user's email (optional). 
     1231 * @param string $email The user's e-mail address (optional). 
    12321232 * @return int The new user's ID. 
    12331233 */ 
    12341234function create_user($username, $password, $email) { 
    … …  
    14591459} 
    14601460 
    14611461/** 
    1462  * Retrieve the email of the author of the current post. 
     1462 * Retrieve the e-mail address of the author of the current post. 
    14631463 * 
    14641464 * @since 1.5 
    14651465 * @deprecated 2.8 
    … …  
    14741474} 
    14751475 
    14761476/** 
    1477  * Display the email of the author of the current post. 
     1477 * Display the e-mail address of the author of the current post. 
    14781478 * 
    14791479 * @since 0.71 
    14801480 * @deprecated 2.8 

  • wp-includes/pluggable.php

     
    163163 * @since 2.8.0 
    164164 * 
    165165 * @param string $field The field to retrieve the user with.  id | slug | email | login 
    166  * @param int|string $value A value for $field.  A user ID, slug, email address, or login name. 
     166 * @param int|string $value A value for $field.  A user ID, slug, e-mail address, or login name. 
    167167 * @return bool|object False on failure, User DB row object 
    168168 */ 
    169169function get_user_by($field, $value) { 
    … …  
    218218 
    219219if ( !function_exists('get_user_by_email') ) : 
    220220/** 
    221  * Retrieve user info by email. 
     221 * Retrieve user info by e-mail address. 
    222222 * 
    223223 * @since 2.5 
    224224 * 
    225  * @param string $email User's email address 
     225 * @param string $email User's e-mail address 
    226226 * @return bool|object False on failure, User DB row object 
    227227 */ 
    228228function get_user_by_email($email) { 
    … …  
    235235 * Send mail, similar to PHP's mail 
    236236 * 
    237237 * A true return value does not automatically mean that the user received the 
    238  * email successfully. It just only means that the method used was able to 
     238 * e-mail successfully. It just only means that the method used was able to 
    239239 * process the request without any errors. 
    240240 * 
    241241 * Using the two 'wp_mail_from' and 'wp_mail_from_name' hooks allow from 
    242242 * creating a from address like 'Name <email@address.com>' when both are set. If 
    243  * just 'wp_mail_from' is set, then just the email address will be used with no 
     243 * just 'wp_mail_from' is set, then just the e-mail address will be used with no 
    244244 * name. 
    245245 * 
    246246 * The default content type is 'text/plain' which does not allow using HTML. 
    247  * However, you can set the content type of the email by using the 
     247 * However, you can set the content type of the e-mail by using the 
    248248 * 'wp_mail_content_type' filter. 
    249249 * 
    250250 * The default charset is based on the charset used on the blog. The charset can 
    … …  
    252252 * 
    253253 * @since 1.2.1 
    254254 * @uses apply_filters() Calls 'wp_mail' hook on an array of all of the parameters. 
    255  * @uses apply_filters() Calls 'wp_mail_from' hook to get the from email address. 
     255 * @uses apply_filters() Calls 'wp_mail_from' hook to get the from e-mail address. 
    256256 * @uses apply_filters() Calls 'wp_mail_from_name' hook to get the from address name. 
    257  * @uses apply_filters() Calls 'wp_mail_content_type' hook to get the email content type. 
    258  * @uses apply_filters() Calls 'wp_mail_charset' hook to get the email charset 
     257 * @uses apply_filters() Calls 'wp_mail_content_type' hook to get the e-mail content type. 
     258 * @uses apply_filters() Calls 'wp_mail_charset' hook to get the e-mail charset 
    259259 * @uses do_action_ref_array() Calls 'phpmailer_init' hook on the reference to 
    260260 *              phpmailer object. 
    261261 * @uses PHPMailer 
    262262 * @ 
    263263 * 
    264  * @param string|array $to Array or comma-separated list of email addresses to send message. 
    265  * @param string $subject Email subject 
     264 * @param string|array $to Array or comma-separated list of e-mail addresses to send message. 
     265 * @param string $subject E-mail subject 
    266266 * @param string $message Message contents 
    267267 * @param string|array $headers Optional. Additional headers. 
    268268 * @param string|array $attachments Optional. Files to attach. 
    269  * @return bool Whether the email contents were sent successfully. 
     269 * @return bool Whether the e-mail contents were sent successfully. 
    270270 */ 
    271271function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) { 
    272272        // Compact the input, apply the filters, and extract them back out 
    … …  
    369369        $phpmailer->ClearCustomHeaders(); 
    370370        $phpmailer->ClearReplyTos(); 
    371371 
    372         // From email and name 
     372        // From e-mail and name 
    373373        // If we don't have a name from the input headers 
    374374        if ( !isset( $from_name ) ) 
    375375                $from_name = 'WordPress'; 
    376376 
    377         /* If we don't have an email from the input headers default to wordpress@$sitename 
     377        /* If we don't have an e-mail from the input headers default to wordpress@$sitename 
    378378         * Some hosts will block outgoing mail from this address if it doesn't exist but 
    379379         * there's no easy alternative. Defaulting to admin_email might appear to be another 
    380380         * option but some hosts may refuse to relay mail from an unknown domain. See 
    … …  
    998998 * 
    999999 * @param int $comment_id Comment ID 
    10001000 * @param string $comment_type Optional. The comment type either 'comment' (default), 'trackback', or 'pingback' 
    1001  * @return bool False if user email does not exist. True on completion. 
     1001 * @return bool False if user e-mail address does not exist. True on completion. 
    10021002 */ 
    10031003function wp_notify_postauthor($comment_id, $comment_type='') { 
    10041004        $comment = get_comment($comment_id); 
    … …  
    10071007 
    10081008        if ( $comment->user_id == $post->post_author ) return false; // The author moderated a comment on his own post 
    10091009 
    1010         if ('' == $user->user_email) return false; // If there's no email to send the comment to 
     1010        if ('' == $user->user_email) return false; // If there's no e-mail address to send the comment to 
    10111011 
    10121012        $comment_author_domain = @gethostbyaddr($comment->comment_author_IP); 
    10131013 
    10141014        // The blogname option is escaped with esc_html on the way into the database in sanitize_option 
    1015         // we want to reverse this for the plain text arena of emails. 
     1015        // we want to reverse this for the plain text arena of e-mail messages. 
    10161016        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 
    10171017 
    10181018        if ( empty( $comment_type ) ) $comment_type = 'comment'; 
    … …  
    11051105        $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'"); 
    11061106 
    11071107        // The blogname option is escaped with esc_html on the way into the database in sanitize_option 
    1108         // we want to reverse this for the plain text arena of emails. 
     1108        // we want to reverse this for the plain text arena of e-mail messages. 
    11091109        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 
    11101110 
    11111111        switch ($comment->comment_type) 
    … …  
    11621162 
    11631163if ( !function_exists('wp_password_change_notification') ) : 
    11641164/** 
    1165  * Notify the blog admin of a user changing password, normally via email. 
     1165 * Notify the blog admin of a user changing password, normally via e-mail. 
    11661166 * 
    11671167 * @since 2.7 
    11681168 * 
    … …  
    11741174        if ( $user->user_email != get_option('admin_email') ) { 
    11751175                $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n"; 
    11761176                // The blogname option is escaped with esc_html on the way into the database in sanitize_option 
    1177                 // we want to reverse this for the plain text arena of emails. 
     1177                // we want to reverse this for the plain text arena of e-mail messages. 
    11781178                $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 
    11791179                wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), $blogname), $message); 
    11801180        } 
    … …  
    11831183 
    11841184if ( !function_exists('wp_new_user_notification') ) : 
    11851185/** 
    1186  * Notify the blog admin of a new user, normally via email. 
     1186 * Notify the blog admin of a new user, normally via e-mail. 
    11871187 * 
    11881188 * @since 2.0 
    11891189 * 
    … …  
    11971197        $user_email = stripslashes($user->user_email); 
    11981198 
    11991199        // The blogname option is escaped with esc_html on the way into the database in sanitize_option 
    1200         // we want to reverse this for the plain text arena of emails. 
     1200        // we want to reverse this for the plain text arena of e-mail messages. 
    12011201        $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 
    12021202 
    12031203        $message  = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n"; 
    … …  
    15861586 
    15871587if ( !function_exists( 'get_avatar' ) ) : 
    15881588/** 
    1589  * Retrieve the avatar for a user who provided a user ID or email address. 
     1589 * Retrieve the avatar for a user who provided a user ID or e-mail address. 
    15901590 * 
    15911591 * @since 2.5 
    1592  * @param int|string|object $id_or_email A user ID,  email address, or comment object 
     1592 * @param int|string|object $id_or_email A user ID, e-mail address, or comment object 
    15931593 * @param int $size Size of the avatar image 
    15941594 * @param string $default URL to a default image to use if no avatar is available 
    15951595 * @param string $alt Alternate text to use in image tag. Defaults to blank 

  • wp-includes/ms-functions.php

     
    441441                $errors->add('user_name',  __('That username is not allowed')); 
    442442 
    443443        if ( is_email_address_unsafe( $user_email ) ) 
    444                 $errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.')); 
     444                $errors->add('user_email',  __('You cannot use that e-mail address to signup. We are having problems with them blocking some of our e-mail. Please use another e-mail provider.')); 
    445445 
    446446        if ( strlen( $user_name ) < 4 ) 
    447447                $errors->add('user_name',  __('Username must be at least 4 characters')); 
    … …  
    456456                $errors->add('user_name', __('Sorry, usernames must have letters too!')); 
    457457 
    458458        if ( !is_email( $user_email ) ) 
    459                 $errors->add('user_email', __('Please enter a correct email address')); 
     459                $errors->add('user_email', __('Please enter a correct e-mail address')); 
    460460 
    461461        $limited_email_domains = get_site_option( 'limited_email_domains' ); 
    462462        if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) { 
    463463                $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) ); 
    464464                if ( in_array( $emaildomain, $limited_email_domains ) == false ) 
    465                         $errors->add('user_email', __('Sorry, that email address is not allowed!')); 
     465                        $errors->add('user_email', __('Sorry, that e-mail address is not allowed!')); 
    466466        } 
    467467 
    468468        // Check if the username has been used already. 
    … …  
    471471 
    472472        // Check if the email address has been used already. 
    473473        if ( email_exists($user_email) ) 
    474                 $errors->add('user_email', __('Sorry, that email address is already used!')); 
     474                $errors->add('user_email', __('Sorry, that e-mail address is already used!')); 
    475475 
    476476        // Has someone already signed up for this username? 
    477477        $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) ); 
    … …  
    496496                if ( $diff > 172800 ) 
    497497                        $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_email = %s", $user_email) ); 
    498498                else 
    499                         $errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.')); 
     499                        $errors->add('user_email', __('That e-mail address has already been used. Please check your inbox for an activation e-mail. It will become available in a couple of days if you do nothing.')); 
    500500        } 
    501501 
    502502        $result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors); 
    … …  
    573573        } 
    574574 
    575575        // Has someone already signed up for this domain? 
    576         $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check email too? 
     576        $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check e-mail too? 
    577577        if ( ! empty($signup) ) { 
    578578                $diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered); 
    579579                // If registered more than two days ago, cancel registration and let this signup go through. 
    … …  
    642642        if ( !apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta) ) 
    643643                return false; 
    644644 
    645         // Send email with activation link. 
     645        // Send e-mail message with activation link. 
    646646        if ( !is_subdomain_install() || $current_site->id != 1 ) 
    647647                $activate_url = network_site_url("wp-activate.php?key=$key"); 
    648648        else 
    … …  
    654654                $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 
    655655        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 
    656656        $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    657         $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key ); 
     657        $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another e-mail message* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key ); 
    658658        // TODO: Don't hard code activation link. 
    659659        $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1$s] Activate %2$s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) ); 
    660660        wp_mail($user_email, $subject, $message, $message_headers); 
    … …  
    665665        if ( !apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta) ) 
    666666                return false; 
    667667 
    668         // Send email with activation link. 
     668        // Send e-mail message with activation link. 
    669669        $admin_email = get_site_option( 'admin_email' ); 
    670670        if ( $admin_email == '' ) 
    671671                $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 
    672672        $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 
    673673        $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    674         $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key ); 
     674        $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another e-mail message* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key ); 
    675675        // TODO: Don't hard code activation link. 
    676676        $subject = sprintf( __( apply_filters( 'wpmu_signup_user_notification_subject', '[%1$s] Activate %2$s' ) ), $from_name, $user); 
    677677        wp_mail($user_email, $subject, $message, $message_headers); 

  • xmlrpc.php

     
    12991299 
    13001300                        if ( get_option('require_name_email') ) { 
    13011301                                if ( 6 > strlen($comment['comment_author_email']) || '' == $comment['comment_author'] ) 
    1302                                         return new IXR_Error( 403, __( 'Comment author name and email are required' ) ); 
     1302                                        return new IXR_Error( 403, __( 'Comment author name and e-mail are required' ) ); 
    13031303                                elseif ( !is_email($comment['comment_author_email']) ) 
    13041304                                        return new IXR_Error( 403, __( 'A valid email address is required' ) ); 
    13051305                        } 

  • wp-mail.php

     
    11<?php 
    22/** 
    3  * Gets the email message from the user's mailbox to add as 
     3 * Gets the e-mail message from the user's mailbox to add as 
    44 * a WordPress post. Mailbox connection information must be 
    55 * configured under Settings > Writing 
    66 * 
    … …  
    1313if ( ! apply_filters( 'enable_post_by_email_configuration', true ) ) 
    1414        wp_die( __( 'This action has been disabled by the administrator.' ) ); 
    1515 
    16 /** Allow a plugin to do a complete takeover of Post by Email **/ 
     16/** Allow a plugin to do a complete takeover of Post by E-mail **/ 
    1717do_action('wp-mail.php'); 
    1818 
    1919/** Get the POP3 class with which to access the mailbox. */ 
    … …  
    103103                                $subject = $subject[0]; 
    104104                        } 
    105105 
    106                         // Set the author using the email address (From or Reply-To, the last used) 
     106                        // Set the author using the e-mail address (From or Reply-To, the last used) 
    107107                        // otherwise use the site admin 
    108108                        if ( preg_match('/(From|Reply-To): /', $line) )  { 
    109109                                if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) ) 
    … …  
    179179        } 
    180180        $content = trim($content); 
    181181 
    182         //Give Post-By-Email extending plugins full access to the content 
     182        //Give Post-By-E-mail extending plugins full access to the content 
    183183        //Either the raw content or the content of the last quoted-printable section 
    184184        $content = apply_filters('wp_mail_original_content', $content); 
    185185 
    … …  
    212212        if ( is_wp_error( $post_ID ) ) 
    213213                echo "\n" . $post_ID->get_error_message(); 
    214214 
    215         // We couldn't post, for whatever reason. Better move forward to the next email. 
     215        // We couldn't post, for whatever reason. Better move forward to the next e-mail message. 
    216216        if ( empty( $post_ID ) ) 
    217217                continue; 
    218218 

  • readme.html

     
    8181</dl> 
    8282 
    8383<h1><abbr title="eXtensible Markup Language">XML</abbr>-<abbr title="Remote Procedure Call">RPC</abbr> and Atom Interface</h1> 
    84 <p>You can post to your WordPress blog with tools like <a href="http://download.live.com/writer">Windows Live Writer</a>, <a href="http://illuminex.com/ecto/">Ecto</a>, <a href="http://bloggar.com/">w.bloggar</a>, <a href="http://radio.userland.com/">Radio Userland</a> (which means you can use Radio's email-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the blogging <abbr title="application programming interface">API</abbr>s! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support"><abbr>XML</abbr>-<abbr>RPC</abbr> support on the Codex</a>.</p> 
     84<p>You can post to your WordPress blog with tools like <a href="http://download.live.com/writer">Windows Live Writer</a>, <a href="http://illuminex.com/ecto/">Ecto</a>, <a href="http://bloggar.com/">w.bloggar</a>, <a href="http://radio.userland.com/">Radio Userland</a> (which means you can use Radio's e-mail-to-blog feature), <a href="http://www.newzcrawler.com/">NewzCrawler</a>, and other tools that support the blogging <abbr title="application programming interface">API</abbr>s! :) You can read more about <a href="http://codex.wordpress.org/XML-RPC_Support"><abbr>XML</abbr>-<abbr>RPC</abbr> support on the Codex</a>.</p> 
    8585 
    86 <h1>Post via Email</h1> 
    87 <p>You can post from an email client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret <abbr title="Post Office Protocol version 3">POP3</abbr> account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with <a href="http://en.wikipedia.org/wiki/Cron">cron</a>-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> <abbr title="Uniform Resource Locator">URL</abbr>.</p> 
    88 <p>Posting is easy: Any email sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will <em>delete</em> emails that are successfully posted.</p> 
     86<h1>Post via E-mail</h1> 
     87<p>You can post from an e-mail client! To set this up go to your &quot;Writing&quot; options screen and fill in the connection details for your secret <abbr title="Post Office Protocol version 3">POP3</abbr> account. Then you need to set up <code>wp-mail.php</code> to execute periodically to check the mailbox for new posts. You can do it with <a href="http://en.wikipedia.org/wiki/Cron">cron</a>-jobs, or if your host doesn't support it you can look into the various website-monitoring services, and make them check your <code>wp-mail.php</code> <abbr title="Uniform Resource Locator">URL</abbr>.</p> 
     88<p>Posting is easy: Any e-mail message sent to the address you specify will be posted, with the subject as the title. It is best to keep the address discrete. The script will <em>delete</em> e-mail messages that are successfully posted.</p> 
    8989 
    9090<h1>User Roles</h1> 
    9191<p>We introduced a very flexible roles system in version 2.0. You can <a href="http://codex.wordpress.org/Roles_and_Capabilities" title="WordPress roles and capabilities">read more about Roles and Capabilities on the Codex</a>.</p> 

  • wp-activate.php

     
    6565                                <?php 
    6666                                echo '<p class="lead-in">'; 
    6767                                if ( $signup->domain . $signup->path == '' ) { 
    68                                         printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;.  Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); 
     68                                        printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;.  Please check your e-mail inbox at %3$s for your password and login instructions. If you do not receive an e-mail message, please check your junk or spam folder. If you still do not receive an e-mail message within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) ); 
    6969                                } else { 
    70                                         printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  Please check your email inbox at %4$s for your password and login instructions.  If you do not receive an email, please check your junk or spam folder.  If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) ); 
     70                                        printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;.  Please check your e-mail inbox at %4$s for your password and login instructions.  If you do not receive an e-mail message, please check your junk or spam folder.  If you still do not receive an e-mail message within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) ); 
    7171                                } 
    7272                                echo '</p>'; 
    7373                        } else { 

  • wp-admin/network.php

     
    271271                                <th scope='row'><?php esc_html_e( 'Admin E-mail Address' ); ?></th> 
    272272                                <td> 
    273273                                        <input name='email' type='text' size='45' value='<?php echo esc_attr( $admin_email ); ?>' /> 
    274                                         <br /><?php _e( 'Your email address.' ); ?> 
     274                                        <br /><?php _e( 'Your e-mail address.' ); ?> 
    275275                                </td> 
    276276                        </tr> 
    277277                </table> 

  • wp-admin/ms-edit.php

     
    162162                if ( empty( $domain ) ) 
    163163                        wp_die( __( 'Missing or invalid site address.' ) ); 
    164164                if ( empty( $email ) ) 
    165                         wp_die( __( 'Missing email address.' ) ); 
     165                        wp_die( __( 'Missing e-mail address.' ) ); 
    166166                if ( !is_email( $email ) ) 
    167                         wp_die( __( 'Invalid email address.' ) ); 
     167                        wp_die( __( 'Invalid e-mail address.' ) ); 
    168168 
    169169                if ( is_subdomain_install() ) { 
    170170                        $newdomain = $domain . '.' . preg_replace( '|^www\.|', '', $current_site->domain ); 
    … …  
    607607                        wp_die( __( 'Cannot create an empty user.' ) ); 
    608608                $user = $_POST['user']; 
    609609                if ( empty($user['username']) && empty($user['email']) ) 
    610                         wp_die( __( 'Missing username and email.' ) ); 
     610                        wp_die( __( 'Missing username and e-mail address.' ) ); 
    611611                elseif ( empty($user['username']) ) 
    612612                        wp_die( __( 'Missing username.' ) ); 
    613613                elseif ( empty($user['email']) ) 
    614                         wp_die( __( 'Missing email.' ) ); 
     614                        wp_die( __( 'Missing e-mail address.' ) ); 
    615615 
    616616                $password = wp_generate_password(); 
    617617                $user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, esc_html( $user['email'] ) ); 
    618618 
    619619                if ( false == $user_id ) 
    620                         wp_die( __( 'Duplicated username or email address.' ) ); 
     620                        wp_die( __( 'Duplicated username or e-mail address.' ) ); 
    621621                else 
    622622                        wp_new_user_notification( $user_id, $password ); 
    623623 

  • wp-admin/edit-comments.php

     
    107107 
    108108add_contextual_help( $current_screen, '<p>' . __('You can manage comments made on your site similar to the way you manage Posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.') . '</p>' . 
    109109        '<p>' . __('A yellow row means the comment is waiting for you to moderate it.') . '</p>' . 
    110         '<p>' . __('In the Author column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.') . '</p>' . 
     110        '<p>' . __('In the Author column, in addition to the author&#8217;s name, e-mail address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.') . '</p>' . 
    111111        '<p>' . __('In the Comment column, above each comment it says &#8220;Submitted on,&#8221; followed by the date and time the comment was left on your site. Clicking on the date/time link will take you to that comment on your live site.') . '</p>' . 
    112112        '<p>' . __('In the In Response To column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The &#8220;#&#8221; permalink symbol below leads to that post on your live site. The small bubble with the number in it shows how many comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post.') . '</p>' . 
    113113        '<p>' . __('Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link below to learn more.') . '</p>' . 

  • wp-admin/includes/upgrade.php

     
    2828 * 
    2929 * @param string $blog_title Blog title. 
    3030 * @param string $user_name User's username. 
    31  * @param string $user_email User's email. 
     31 * @param string $user_email User's e-mail address. 
    3232 * @param bool $public Whether blog is public. 
    3333 * @param null $deprecated Optional. Not used. 
    3434 * @param string $user_password Optional. User's chosen password. Will default to a random password. 

  • wp-admin/includes/user.php

     
    170170        } elseif ( !is_email( $user->user_email ) ) { 
    171171                $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) ); 
    172172        } elseif ( ( $owner_id = email_exists($user->user_email) ) && $owner_id != $user->ID ) { 
    173                 $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) ); 
     173                $errors->add( 'email_exists', __('<strong>ERROR</strong>: This e-mail is already registered, please choose another one.'), array( 'form-field' => 'email' ) ); 
    174174        } 
    175175 
    176176        // Allow plugins to return their own errors. 

  • wp-admin/includes/ms.php

     
    286286 
    287287        $content = apply_filters( 'new_admin_email_content', __( "Dear user, 
    288288 
    289 You recently requested to have the administration email address on 
     289You recently requested to have the administration e-mail address on 
    290290your site changed. 
    291291If this is correct, please click on the following link to change it: 
    292292###ADMIN_URL### 
    293293 
    294 You can safely ignore and delete this email if you do not want to 
     294You can safely ignore and delete this e-mail message if you do not want to 
    295295take this action. 
    296296 
    297 This email has been sent to ###EMAIL### 
     297This e-mail message has been sent to ###EMAIL### 
    298298 
    299299Regards, 
    300300All at ###SITENAME### 
    … …  
    305305        $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); 
    306306        $content = str_replace( '###SITEURL###', network_home_url(), $content ); 
    307307 
    308         wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), get_option( 'blogname' ) ), $content ); 
     308        wp_mail( $value, sprintf( __( '[%s] New Admin E-mail Address' ), get_option( 'blogname' ) ), $content ); 
    309309} 
    310310add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); 
    311311add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); 
    … …  
    340340 
    341341                $content = apply_filters( 'new_user_email_content', __( "Dear user, 
    342342 
    343 You recently requested to have the email address on your account changed. 
     343You recently requested to have the e-mail address on your account changed. 
    344344If this is correct, please click on the following link to change it: 
    345345###ADMIN_URL### 
    346346 
    347 You can safely ignore and delete this email if you do not want to 
     347You can safely ignore and delete this e-mail message if you do not want to 
    348348take this action. 
    349349 
    350 This email has been sent to ###EMAIL### 
     350This e-mail message has been sent to ###EMAIL### 
    351351 
    352352Regards, 
    353353All at ###SITENAME### 
    … …  
    358358                $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); 
    359359                $content = str_replace( '###SITEURL###', network_home_url(), $content ); 
    360360 
    361                 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), get_option( 'blogname' ) ), $content ); 
     361                wp_mail( $_POST['email'], sprintf( __( '[%s] New E-mail Address' ), get_option( 'blogname' ) ), $content ); 
    362362                $_POST['email'] = $current_user->user_email; 
    363363        } 
    364364} 
    … …  
    366366 
    367367function new_user_email_admin_notice() { 
    368368        if ( strpos( $_SERVER['PHP_SELF'], 'profile.php' ) && isset( $_GET['updated'] ) && $email = get_option( get_current_user_id() . '_new_email' ) ) 
    369                 echo "<div class='update-nag'>" . sprintf( __( "Your email address has not been updated yet. Please check your inbox at %s for a confirmation email." ), $email['newemail'] ) . "</div>"; 
     369                echo "<div class='update-nag'>" . sprintf( __( "Your e-mail address has not been updated yet. Please check your inbox at %s for a confirmation e-mail message." ), $email['newemail'] ) . "</div>"; 
    370370} 
    371371add_action( 'admin_notices', 'new_user_email_admin_notice' ); 
    372372 

  • wp-admin/ms-delete-site.php

     
    6060        wp_mail( get_option( 'admin_email' ), "[ " . get_option( 'blogname' ) . " ] ".__( 'Delete My Site' ), $content ); 
    6161        ?> 
    6262 
    63         <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p> 
     63        <p><?php _e( 'Thank you. Please check your e-mail for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p> 
    6464 
    6565<?php } else { 
    6666        ?> 
    67         <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an email with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p> 
     67        <p><?php printf( __( 'If you do not want to use your %s site any more, you can delete it using the form below. When you click <strong>Delete My Site Permanently</strong> you will be sent an e-mail message with a link in it. Click on this link to delete your site.'), $current_site->site_name); ?></p> 
    6868        <p><?php _e( 'Remember, once deleted your site cannot be restored.' ) ?></p> 
    6969 
    7070        <form method="post" name="deletedirect"> 

  • wp-admin/ms-sites.php

     
    3838                '<li>' . __('Visit to go to the frontend site live.') . '</li></ul>' . 
    3939                '<p>' . __('The site ID is used internally, and is not shown on the front end of the site or to users/viewers.') . '</p>' . 
    4040                '<p>' . __('Clicking on bold settings can re-sort this table. The upper right icons switch between list and excerpt views.') . '</p>' . 
    41                 '<p>' . __("Clicking on Add Site, after filling out the address, title, and admin's email address, adds the site instantly to the network and this table. You may want to then click on the action link to edit options for that site.") . '</p>' . 
    42                 '<p>' . __('If the admin email for the new site does not exist in the database, a new user will also be created.') . '</p>' . 
     41                '<p>' . __("Clicking on Add Site, after filling out the address, title, and admin's e-mail address, adds the site instantly to the network and this table. You may want to then click on the action link to edit options for that site.") . '</p>' . 
     42                '<p>' . __('If the admin e-mail address for the new site does not exist in the database, a new user will also be created.') . '</p>' . 
    4343                '<p><strong>' . __('For more information:') . '</strong></p>' . 
    4444                '<p>' . __('<a href="http://codex.wordpress.org/Super_Admin_Sites_SubPanel" target="_blank">Documentation on Sites</a>') . '</p>' . 
    4545                '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>' 
    … …  
    729729                                                <td><input name="blog[title]" type="text" class="regular-text" title="<?php _e( 'Title' ) ?>"/></td> 
    730730                                        </tr> 
    731731                                        <tr class="form-field form-required"> 
    732                                                 <th scope="row"><?php _e( 'Admin Email' ) ?></th> 
     732                                                <th scope="row"><?php _e( 'Admin E-mail' ) ?></th> 
    733733                                                <td><input name="blog[email]" type="text" class="regular-text" title="<?php _e( 'Email' ) ?>"/></td> 
    734734                                        </tr> 
    735735                                        <tr class="form-field"> 
    736                                                 <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td> 
     736                                                <td colspan="2"><?php _e( 'A new user will be created if the above e-mail address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this e-mail address.' ) ?></td> 
    737737                                        </tr> 
    738738                                </table> 
    739739                                <p class="submit"> 

  • wp-admin/user-new.php

     
    2424You've been invited to join '%s' at 
    2525%s as a %s. 
    2626If you do not want to join this site please ignore 
    27 this email. This invitation will expire in a few days. 
     27this e-mail message. This invitation will expire in a few days. 
    2828 
    2929Please click the following link to activate your user account: 
    3030%%s" ), get_bloginfo('name'), site_url(), esc_html( $_REQUEST[ 'role' ] ) ); 
    … …  
    8888                        } else { 
    8989                                $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true)); 
    9090                                if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { 
    91                                         add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email 
     91                                        add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation e-mail 
    9292                                } 
    9393                                wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) ); 
    9494                                if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) { 
    … …  
    118118        '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' . 
    119119    '</ul>' . 
    120120    '<p>' . __('You must assign a password to the new user, but don&#8217;t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' . 
    121     '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.') . '</p>' . 
     121    '<p>' . __('New users will receive an e-mail message letting them know they&#8217;ve been added as a user for your site. By default, this e-mail message will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome e-mail message.') . '</p>' . 
    122122    '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>' . 
    123123    '<p><strong>' . __('For more information:') . '</strong></p>' . 
    124124    '<p>' . __('<a href="http://codex.wordpress.org/Users_Add_New_SubPanel" target="_blank">Documentation on Adding New Users</a>') . '</p>' . 
    … …  
    136136        if ( is_multisite() ) { 
    137137                switch ( $_GET['update'] ) { 
    138138                        case "newuserconfimation": 
    139                                 $messages[] = __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.'); 
     139                                $messages[] = __('Invitation e-mail sent to new user. A confirmation link must be clicked before their account is created.'); 
    140140                                break; 
    141141                        case "add": 
    142                                 $messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.'); 
     142                                $messages[] = __('Invitation e-mail sent to user. A confirmation link must be clicked for them to be added to your site.'); 
    143143                                break; 
    144144                        case "addnoconfirmation": 
    145145                                $messages[] = __('User has been added to your site.'); 
    … …  
    191191        else 
    192192                echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>'; 
    193193} else { 
    194         echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this network.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this network. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>'; 
    195         echo '<p>' . __( 'That person will be sent an email asking them to click a link confirming the invite. New users will then be sent an email with a randomly generated password and a login link.' ) . '</p>'; 
     194        echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and e-mail address of an existing user on this network.' ) . '</li><li> ' . __( 'Enter the username and the e-mail address of a person who is not already a member of this network. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>'; 
     195        echo '<p>' . __( 'That person will be sent an e-mail message asking them to click a link confirming the invite. New users will then be sent an e-mail message with a randomly generated password and a login link.' ) . '</p>'; 
    196196} 
    197197?> 
    198198<form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:users: validate"<?php do_action('user_new_form_tag');?>> 
    … …  
    243243        </tr> 
    244244        <tr> 
    245245                <th scope="row"><label for="send_password"><?php _e('Send Password?') ?></label></th> 
    246                 <td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked($new_user_send_password, true); ?> /> <?php _e('Send this password to the new user by email.'); ?></label></td> 
     246                <td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked($new_user_send_password, true); ?> /> <?php _e('Send this password to the new user by e-mail.'); ?></label></td> 
    247247        </tr> 
    248248<?php endif; ?> 
    249249<?php } // !is_multisite ?> 
    … …  
    260260        </tr> 
    261261        <?php if ( is_multisite() && is_super_admin() ) { ?> 
    262262        <tr> 
    263                 <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th> 
    264                 <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" /> <?php _e( 'Site administrators can add a user without sending the confirmation email.' ); ?></label></td> 
     263                <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation E-mail') ?></label></th> 
     264                <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" /> <?php _e( 'Site administrators can add a user without sending the confirmation e-mail.' ); ?></label></td> 
    265265        </tr> 
    266266        <?php } ?> 
    267267</table> 

  • wp-admin/ms-users.php

     
    2323        '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' . 
    2424        '<p>' . __('You can also go to the user&#8217;s profile page by clicking on the individual username.') . '</p>' . 
    2525        '<p>' . __('You can sort the table by clicking on any of the bold headings and switch between list and excerpt views by using the icons in the upper right.') . '</p>' . 
    26         '<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same email addresses.') . '</p>' . 
    27         '<p>' . __('Add User will add that person to this table and send them an email.') . '</p>' . 
     26        '<p>' . __('The bulk action will permanently delete selected users, or mark/unmark those selected as spam. Spam users will have posts removed and will be unable to sign up again with the same e-mail addresses.') . '</p>' . 
     27        '<p>' . __('Add User will add that person to this table and send them an e-mail message.') . '</p>' . 
    2828        '<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>' . 
    2929        '<p>' . __('You can make an existing user an additional super admin by going to the Edit User profile page and checking the box to grant that privilege.') . '</p>' . 
    3030        '<p><strong>' . __('For more information:') . '</strong></p>' . 
    … …  
    361361                        <td><input type="text" class="regular-text" name="user[username]" /></td> 
    362362                </tr> 
    363363                <tr class="form-field form-required"> 
    364                         <th scope="row"><?php _e( 'Email' ) ?></th> 
     364                        <th scope="row"><?php _e( 'E-mail' ) ?></th> 
    365365                        <td><input type="text" class="regular-text" name="user[email]" /></td> 
    366366                </tr> 
    367367                <tr class="form-field"> 
    368                         <td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td> 
     368                        <td colspan="2"><?php _e( 'Username and password will be mailed to the above e-mail address.' ) ?></td> 
    369369                </tr> 
    370370        </table> 
    371371        <p class="submit"> 

  • wp-admin/options.php

     
    3030if ( !current_user_can('manage_options') ) 
    3131        wp_die(__('Cheatin&#8217; uh?')); 
    3232 
    33 // Handle admin email change requests 
     33// Handle admin e-mail change requests 
    3434if ( is_multisite() ) { 
    3535        if ( ! empty($_GET[ 'adminhash' ] ) ) { 
    3636                $new_admin_details = get_option( 'adminhash' ); 

  • wp-admin/user-edit.php

     
    7474if ( is_multisite() && ! current_user_can( 'manage_network_users' ) && $user_id != $current_user->ID && ! apply_filters( 'enable_edit_any_user_configuration', true ) ) 
    7575        wp_die( __( 'You do not have permission to edit this user.' ) ); 
    7676 
    77 // Execute confirmed email change. See send_confirmation_on_profile_email(). 
     77// Execute confirmed e-mail address change. See send_confirmation_on_profile_email(). 
    7878if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) { 
    7979        $new_email = get_option( $current_user->ID . '_new_email' ); 
    8080        if ( $new_email[ 'hash' ] == $_GET[ 'newuseremail' ] ) { 
    … …  
    119119} else { 
    120120        $user = get_userdata( $user_id ); 
    121121 
    122         // Update the email address in signups, if present. 
     122        // Update the e-mail address in signups, if present. 
    123123        if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) 
    124124                $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) ); 
    125125 

  • wp-admin/install.php

     
    127127                <tr> 
    128128                        <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th> 
    129129                        <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" /> 
    130                         <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td> 
     130                        <p><?php _e( 'Double-check your e-mail address before continuing.' ); ?></p></td> 
    131131                </tr> 
    132132                <tr> 
    133133                        <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td> 

  • wp-admin/ms-options.php

     
    2020 
    2121add_contextual_help($current_screen, 
    2222        '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' . 
    23         '<p>' . __('Operational settings has fields for the network&#8217;s name and admin email.') . '</p>' . 
     23        '<p>' . __('Operational settings has fields for the network&#8217;s name and admin e-mail.') . '</p>' . 
    2424        '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is Subscriber, but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' . 
    2525        '<p>' . __('Registration settings can disable/enable public signups. If you let others sign up for a site, install spam plugins. Spaces, not commas, should separate names banned as sites for this network.') . '</p>' . 
    26         '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome email for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' . 
     26        '<p>' . __('New site settings are defaults applied when a new site is created in the network. These include welcome e-mail for when a new site or user account is registered, and what&#8127;s put in the first post, page, comment, comment author, and comment URL.') . '</p>' . 
    2727        '<p>' . __('Upload settings control the size of the uploaded files and the amount of available upload space for each site. You can change the default value for specific sites when you edit a particular site. Allowed file types are also listed (space separated only).') . '</p>' . 
    2828        '<p>' . __('Checkboxes for media upload buttons set which are shown in the visual editor. If unchecked, a generic upload button is still visible; other media types can still be uploaded if on the allowed file types list.') . '</p>' . 
    2929        '<p>' . __('Menu setting enables/disables the plugin menus from appearing for non super admins, so that only super admins, not site admins, have access to activate plugins.') . '</p>' . 
    … …  
    5959                        </tr> 
    6060 
    6161                        <tr valign="top"> 
    62                                 <th scope="row"><label for="admin_email"><?php _e( 'Network Admin Email' ) ?></label></th> 
     62                                <th scope="row"><label for="admin_email"><?php _e( 'Network Admin E-mail' ) ?></label></th> 
    6363                                <td> 
    6464                                        <input name="admin_email" type="text" id="admin_email" class="regular-text" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" /> 
    6565                                        <br /> 
    66                                         <?php printf( __( 'Registration and support emails will come from this address. An address such as <code>support@%s</code> is recommended.' ), $current_site->domain ); ?> 
     66                                        <?php printf( __( 'Registration and support e-mail messages will come from this address. An e-mail address such as <code>support@%s</code> is recommended.' ), $current_site->domain ); ?> 
    6767                                </td> 
    6868                        </tr> 
    6969                </table> 
    … …  
    133133                                        update_site_option( 'registrationnotification', 'yes' ); 
    134134                                ?> 
    135135                                <td> 
    136                                         <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an email notification every time someone registers a site or user account.' ) ?></label> 
     136                                        <label><input name="registrationnotification" type="checkbox" id="registrationnotification" value="yes"<?php checked( get_site_option( 'registrationnotification' ), 'yes' ) ?> /> <?php _e( 'Send the network admin an e-mail notification every time someone registers a site or user account.' ) ?></label> 
    137137                                </td> 
    138138                        </tr> 
    139139 
    … …  
    154154                        </tr> 
    155155 
    156156                        <tr valign="top"> 
    157                                 <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited Email Registrations' ) ?></label></th> 
     157                                <th scope="row"><label for="limited_email_domains"><?php _e( 'Limited E-mail Registrations' ) ?></label></th> 
    158158                                <td> 
    159159                                        <?php $limited_email_domains = get_site_option( 'limited_email_domains' ); 
    160160                                        $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains ); ?> 
    … …  
    166166                        </tr> 
    167167 
    168168                        <tr valign="top"> 
    169                                 <th scope="row"><label for="banned_email_domains"><?php _e('Banned Email Domains') ?></label></th> 
     169                                <th scope="row"><label for="banned_email_domains"><?php _e('Banned E-mail Domains') ?></label></th> 
    170170                                <td> 
    171171                                        <textarea name="banned_email_domains" id="banned_email_domains" cols="45" rows="5"> 
    172172<?php echo wp_htmledit_pre( get_site_option( 'banned_email_domains' ) == '' ? '' : implode( "\n", (array) get_site_option( 'banned_email_domains' ) ) ); ?></textarea> 
    … …  
    180180                <table class="form-table"> 
    181181 
    182182                        <tr valign="top"> 
    183                                 <th scope="row"><label for="welcome_email"><?php _e( 'Welcome Email' ) ?></label></th> 
     183                                <th scope="row"><label for="welcome_email"><?php _e( 'Welcome E-mail' ) ?></label></th> 
    184184                                <td> 
    185185                                        <textarea name="welcome_email" id="welcome_email" rows="5" cols="45" class="large-text"> 
    186186<?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_email' ) ) ) ?></textarea> 
    187187                                        <br /> 
    188                                         <?php _e( 'The welcome email sent to new site owners.' ) ?> 
     188                                        <?php _e( 'The welcome e-mail message sent to new site owners.' ) ?> 
    189189                                </td> 
    190190                        </tr> 
    191191                        <tr valign="top"> 
    192                                 <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User Email' ) ?></label></th> 
     192                                <th scope="row"><label for="welcome_user_email"><?php _e( 'Welcome User E-mail' ) ?></label></th> 
    193193                                <td> 
    194194                                        <textarea name="welcome_user_email" id="welcome_user_email" rows="5" cols="45" class="large-text"> 
    195195<?php echo wp_htmledit_pre( stripslashes( get_site_option( 'welcome_user_email' ) ) ) ?></textarea> 
    196196                                        <br /> 
    197                                         <?php _e( 'The welcome email sent to new users.' ) ?> 
     197                                        <?php _e( 'The welcome e-mail message sent to new users.' ) ?> 
    198198                                </td> 
    199199                        </tr> 
    200200                        <tr valign="top">