From 1f500055a6b36fbf554ceeb0a6d6a955479a6a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= Date: Fri, 28 Aug 2015 03:17:21 +0000 Subject: [PATCH] Drop the hyphen from e-mail and standardize on email. The AP Stylebook changed this in 2011, and we're woefully inconsistent, so let's go with the standard. props morganestes, voldemortensen, niallkennedy (for patching on the previous AP style). fixes #26156. Built from https://develop.svn.wordpress.org/trunk@33774 git-svn-id: http://core.svn.wordpress.org/trunk@33742 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/comment.php | 2 +- wp-admin/edit-form-comment.php | 2 +- .../includes/class-wp-ms-users-list-table.php | 2 +- .../includes/class-wp-users-list-table.php | 2 +- wp-admin/includes/schema.php | 2 +- wp-admin/includes/template.php | 2 +- wp-admin/includes/user.php | 4 ++-- wp-admin/install.php | 4 ++-- wp-admin/options-discussion.php | 12 +++++------ wp-admin/options-general.php | 8 ++++---- wp-admin/options-writing.php | 6 +++--- wp-admin/user-edit.php | 4 ++-- wp-admin/user-new.php | 6 +++--- wp-includes/pluggable.php | 6 +++--- wp-includes/theme-compat/comments-popup.php | 4 ++-- wp-includes/user-functions.php | 4 ++-- wp-includes/version.php | 2 +- wp-login.php | 20 +++++++++---------- 18 files changed, 46 insertions(+), 46 deletions(-) diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 7131a0c7f3..d83cb53544 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -166,7 +166,7 @@ if ( $comment->comment_approved != '0' ) { // if not unapproved comment_author_email ) { ?> - + comment_author_email; ?> diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index 9b8062da12..e1e95996f4 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -33,7 +33,7 @@ if ( !defined('ABSPATH') ) - + diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php index 39dadc788a..f0c931924a 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-ms-users-list-table.php @@ -146,7 +146,7 @@ class WP_MS_Users_List_Table extends WP_List_Table { 'cb' => '', 'username' => __( 'Username' ), 'name' => __( 'Name' ), - 'email' => __( 'E-mail' ), + 'email' => __( 'Email' ), 'registered' => _x( 'Registered', 'user' ), 'blogs' => __( 'Sites' ) ); diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 0b8c966bde..f6c3fcf51e 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -270,7 +270,7 @@ class WP_Users_List_Table extends WP_List_Table { 'cb' => '', 'username' => __( 'Username' ), 'name' => __( 'Name' ), - 'email' => __( 'E-mail' ), + 'email' => __( 'Email' ), 'role' => __( 'Role' ), 'posts' => __( 'Posts' ) ); diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index d965a7e6af..75e8f5bfba 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -895,7 +895,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam $site_user = get_user_by( 'email', $email ); if ( ! is_email( $email ) ) - $errors->add( 'invalid_email', __( 'You must provide a valid e-mail address.' ) ); + $errors->add( 'invalid_email', __( 'You must provide a valid email address.' ) ); if ( $errors->get_error_code() ) return $errors; diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index abab6dfd37..50b6cdaa9e 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -491,7 +491,7 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $
- +
diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index a40efeae3a..729ec1848d 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -149,9 +149,9 @@ function edit_user( $user_id = 0 ) { if ( !$update && username_exists( $user->user_login ) ) $errors->add( 'user_login', __( 'ERROR: This username is already registered. Please choose another one.' )); - /* checking e-mail address */ + /* checking email address */ if ( empty( $user->user_email ) ) { - $errors->add( 'empty_email', __( 'ERROR: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) ); + $errors->add( 'empty_email', __( 'ERROR: Please enter an email address.' ), array( 'form-field' => 'email' ) ); } elseif ( !is_email( $user->user_email ) ) { $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) { diff --git a/wp-admin/install.php b/wp-admin/install.php index 2c0c6071bf..08da49a0d4 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -172,7 +172,7 @@ function display_setup_form( $error = null ) { - +

@@ -293,7 +293,7 @@ switch($step) { $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : ''; $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0; - // Check e-mail address. + // Check email address. $error = false; if ( empty( $user_name ) ) { // TODO: poka-yoke diff --git a/wp-admin/options-discussion.php b/wp-admin/options-discussion.php index 2ddaaac330..52820f6bda 100644 --- a/wp-admin/options-discussion.php +++ b/wp-admin/options-discussion.php @@ -78,7 +78,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
- +
- -
+ +
@@ -170,7 +170,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each

-

+

@@ -179,7 +179,7 @@ printf( __('Comments should be displayed with the %s comments at the top of each
-

+

@@ -235,7 +235,7 @@ endforeach;
-
+
want your site home page to be different from your WordPress installation directory.' ); ?>

- +

@@ -154,14 +154,14 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); - + -

The new address will not become active until confirmed.' ) ?>

+

The new address will not become active until confirmed.' ) ?>

-

%1$s. Cancel'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?>

+

%1$s. Cancel'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?>

diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php index ba7eeca78d..31ef57a2b3 100644 --- a/wp-admin/options-writing.php +++ b/wp-admin/options-writing.php @@ -27,7 +27,7 @@ if ( apply_filters( 'enable_post_by_email_configuration', true ) ) { get_current_screen()->add_help_tab( array( 'id' => 'options-postemail', 'title' => __( 'Post Via Email' ), - 'content' => '

' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '

', + 'content' => '

' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret email account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '

', ) ); } @@ -113,8 +113,8 @@ do_settings_fields('writing', 'remote_publishing'); // A deprecated section. /** This filter is documented in wp-admin/options.php */ if ( apply_filters( 'enable_post_by_email_configuration', true ) ) { ?> -

-

%s, %s, %s.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?>

+

+

%s, %s, %s.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?>

diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 6143514f72..c126be4fce 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -396,7 +396,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c
- + - + diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index 643fc24c5d..b755bdd851 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1463,7 +1463,7 @@ function wp_notify_postauthor( $comment_id, $deprecated = null ) { $notify_message = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n"; /* translators: 1: comment author, 2: author IP, 3: author domain */ $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n"; + $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n"; $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n"; $notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n"; @@ -1593,7 +1593,7 @@ function wp_notify_moderator($comment_id) { $notify_message = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n"; $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; $notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; - $notify_message .= sprintf( __( 'E-mail: %s' ), $comment->comment_author_email ) . "\r\n"; + $notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n"; $notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n"; $notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment->comment_content ) . "\r\n\r\n"; break; @@ -1706,7 +1706,7 @@ function wp_new_user_notification( $user_id, $notify = '' ) { $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n"; - $message .= sprintf(__('E-mail: %s'), $user->user_email) . "\r\n"; + $message .= sprintf(__('Email: %s'), $user->user_email) . "\r\n"; @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message); diff --git a/wp-includes/theme-compat/comments-popup.php b/wp-includes/theme-compat/comments-popup.php index e8f8655eb3..8accfb7f4c 100644 --- a/wp-includes/theme-compat/comments-popup.php +++ b/wp-includes/theme-compat/comments-popup.php @@ -63,7 +63,7 @@ if ( post_password_required($post) ) { // and it doesn't match the cookie

-

HTML allowed: %s'), allowed_tags()); ?>

+

HTML allowed: %s'), allowed_tags()); ?>

@@ -76,7 +76,7 @@ if ( post_password_required($post) ) { // and it doesn't match the cookie

- +

diff --git a/wp-includes/user-functions.php b/wp-includes/user-functions.php index fb13643757..5e09d6b678 100644 --- a/wp-includes/user-functions.php +++ b/wp-includes/user-functions.php @@ -1950,9 +1950,9 @@ function register_new_user( $user_login, $user_email ) { $errors->add( 'username_exists', __( 'ERROR: This username is already registered. Please choose another one.' ) ); } - // Check the e-mail address + // Check the email address if ( $user_email == '' ) { - $errors->add( 'empty_email', __( 'ERROR: Please type your e-mail address.' ) ); + $errors->add( 'empty_email', __( 'ERROR: Please type your email address.' ) ); } elseif ( ! is_email( $user_email ) ) { $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ) ); $user_email = ''; diff --git a/wp-includes/version.php b/wp-includes/version.php index 20ce50c6a4..676d058a80 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-33773'; +$wp_version = '4.4-alpha-33774'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-login.php b/wp-login.php index 57b2a2ef17..42a7cece63 100644 --- a/wp-login.php +++ b/wp-login.php @@ -281,7 +281,7 @@ function retrieve_password() { $errors = new WP_Error(); if ( empty( $_POST['user_login'] ) ) { - $errors->add('empty_username', __('ERROR: Enter a username or e-mail address.')); + $errors->add('empty_username', __('ERROR: Enter a username or email address.')); } elseif ( strpos( $_POST['user_login'], '@' ) ) { $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) ); if ( empty( $user_data ) ) @@ -302,7 +302,7 @@ function retrieve_password() { return $errors; if ( !$user_data ) { - $errors->add('invalidcombo', __('ERROR: Invalid username or e-mail.')); + $errors->add('invalidcombo', __('ERROR: Invalid username or email.')); return $errors; } @@ -407,7 +407,7 @@ function retrieve_password() { $message = apply_filters( 'retrieve_password_message', $message, $key, $user_login, $user_data ); if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) ) - wp_die( __('The e-mail could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function.') ); + wp_die( __('The email could not be sent.') . "
\n" . __('Possible reason: your host may have disabled the mail() function.') ); return true; } @@ -560,7 +560,7 @@ case 'retrievepassword' :

-

" size="20" />

-

-

+


@@ -872,11 +872,11 @@ default: elseif ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) $errors->add('registerdisabled', __('User registration is currently not allowed.')); elseif ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] ) - $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message'); + $errors->add('confirm', __('Check your email for the confirmation link.'), 'message'); elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) - $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); + $errors->add('newpass', __('Check your email for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) - $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); + $errors->add('registered', __('Registration complete. Please check your email.'), 'message'); elseif ( strpos( $redirect_to, 'about.php?updated' ) ) $errors->add('updated', __( 'You have successfully updated WordPress! Please log back in to see what’s new.' ), 'message' ); }
ID . '_new_email' ); @@ -404,7 +404,7 @@ if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_c

Cancel' ), + __( 'There is a pending change of your email to %1$s. Cancel' ), '' . $new_email['newemail'] . '', esc_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ) ) ); ?>

diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index 631c746a57..28c46c63b4 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -289,11 +289,11 @@ if ( is_multisite() ) { echo '

' . __('Add Existing User') . '

'; if ( !is_super_admin() ) { echo '

' . __( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '

'; - $label = __('E-mail'); + $label = __('Email'); $type = 'email'; } else { echo '

' . __( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' ) . '

'; - $label = __('E-mail or Username'); + $label = __('Email or Username'); $type = 'text'; } ?> @@ -377,7 +377,7 @@ $new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unsl