<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[22124] trunk: Consolidate some strings.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22124">22124</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-10-05 19:04:34 +0000 (Fri, 05 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consolidate some strings. Props pavelevap, SergeyBiryukov. see <a href="http://core.trac.wordpress.org/ticket/21728">#21728</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
<li><a href="#trunkwpadminnetworksitenewphp">trunk/wp-admin/network/site-new.php</a></li>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (22123 => 22124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2012-10-05 16:34:32 UTC (rev 22123)
+++ trunk/wp-admin/includes/ms.php 2012-10-05 19:04:34 UTC (rev 22124)
</span><span class="lines">@@ -224,12 +224,12 @@
</span><span class="cx">
</span><span class="cx"> if ( $current_user->user_email != $_POST['email'] ) {
</span><span class="cx"> if ( !is_email( $_POST['email'] ) ) {
</span><del>- $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
</del><ins>+ $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address isn&#8217;t correct." ), array( 'form-field' => 'email' ) );
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
</span><del>- $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address is already used." ), array( 'form-field' => 'email' ) );
</del><ins>+ $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address is already used." ), array( 'form-field' => 'email' ) );
</ins><span class="cx"> delete_option( $current_user->ID . '_new_email' );
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (22123 => 22124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2012-10-05 16:34:32 UTC (rev 22123)
+++ trunk/wp-admin/includes/user.php 2012-10-05 19:04:34 UTC (rev 22124)
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> if ( empty( $user->user_email ) ) {
</span><span class="cx"> $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
</span><span class="cx"> } elseif ( !is_email( $user->user_email ) ) {
</span><del>- $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
</del><ins>+ $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
</ins><span class="cx"> } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
</span><span class="cx"> $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminnetworksitenewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-new.php (22123 => 22124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-new.php 2012-10-05 16:34:32 UTC (rev 22123)
+++ trunk/wp-admin/network/site-new.php 2012-10-05 19:04:34 UTC (rev 22124)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> <?php } else {
</span><span class="cx"> echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
</span><span class="cx"> <?php }
</span><del>- echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
</del><ins>+ echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
</ins><span class="cx"> ?>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span></span></pre></div>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (22123 => 22124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2012-10-05 16:34:32 UTC (rev 22123)
+++ trunk/wp-admin/setup-config.php 2012-10-05 19:04:34 UTC (rev 22124)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key )
</span><span class="cx"> $$key = trim( stripslashes( $_POST[ $key ] ) );
</span><span class="cx">
</span><del>- $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">' . __( 'Try Again' ) . '</a>';
</del><ins>+ $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button">' . __( 'Try again' ) . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( empty( $prefix ) )
</span><span class="cx"> wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (22123 => 22124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2012-10-05 16:34:32 UTC (rev 22123)
+++ trunk/wp-includes/ms-functions.php 2012-10-05 19:04:34 UTC (rev 22124)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! $user ) {
</span><span class="cx"> restore_current_blog();
</span><del>- return new WP_Error('user_does_not_exist', __('That user does not exist.'));
</del><ins>+ return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !get_user_meta($user_id, 'primary_blog', true) ) {
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx"> $errors->add('user_name', __('Sorry, usernames must have letters too!'));
</span><span class="cx">
</span><span class="cx"> if ( !is_email( $user_email ) )
</span><del>- $errors->add('user_email', __( 'Please enter a correct email address.' ) );
</del><ins>+ $errors->add('user_email', __( 'Please enter a valid email address.' ) );
</ins><span class="cx">
</span><span class="cx"> $limited_email_domains = get_site_option( 'limited_email_domains' );
</span><span class="cx"> if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) {
</span><span class="lines">@@ -473,11 +473,11 @@
</span><span class="cx">
</span><span class="cx"> // Check if the username has been used already.
</span><span class="cx"> if ( username_exists($user_name) )
</span><del>- $errors->add('user_name', __('Sorry, that username already exists!'));
</del><ins>+ $errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
</ins><span class="cx">
</span><span class="cx"> // Check if the email address has been used already.
</span><span class="cx"> if ( email_exists($user_email) )
</span><del>- $errors->add('user_email', __('Sorry, that email address is already used!'));
</del><ins>+ $errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
</ins><span class="cx">
</span><span class="cx"> // Has someone already signed up for this username?
</span><span class="cx"> $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> $errors->add('blogname', __( 'Please enter a site name.' ) );
</span><span class="cx">
</span><span class="cx"> if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
</span><del>- $errors->add('blogname', __( 'Only lowercase letters and numbers allowed.' ) );
</del><ins>+ $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
</ins><span class="cx">
</span><span class="cx"> if ( in_array( $blogname, $illegal_names ) == true )
</span><span class="cx"> $errors->add('blogname', __( 'That name is not allowed.' ) );
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> $path = $base.$blogname.'/';
</span><span class="cx"> }
</span><span class="cx"> if ( domain_exists($mydomain, $path, $current_site->id) )
</span><del>- $errors->add('blogname', __('Sorry, that site already exists!'));
</del><ins>+ $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
</ins><span class="cx">
</span><span class="cx"> if ( username_exists( $blogname ) ) {
</span><span class="cx"> if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) )
</span><span class="lines">@@ -956,7 +956,7 @@
</span><span class="cx">
</span><span class="cx"> // Check if the domain has been used already. We should return an error message.
</span><span class="cx"> if ( domain_exists($domain, $path, $site_id) )
</span><del>- return new WP_Error('blog_taken', __('Site already exists.'));
</del><ins>+ return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
</ins><span class="cx">
</span><span class="cx"> if ( !defined('WP_INSTALLING') )
</span><span class="cx"> define( 'WP_INSTALLING', true );
</span><span class="lines">@@ -1629,7 +1629,7 @@
</span><span class="cx"> return $result;
</span><span class="cx">
</span><span class="cx"> if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
</span><del>- wp_die( __('Please try again!') );
</del><ins>+ wp_die( __( 'Please try again.' ) );
</ins><span class="cx">
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (22123 => 22124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2012-10-05 16:34:32 UTC (rev 22123)
+++ trunk/wp-includes/user.php 2012-10-05 19:04:34 UTC (rev 22124)
</span><span class="lines">@@ -1305,7 +1305,7 @@
</span><span class="cx"> return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
</span><span class="cx">
</span><span class="cx"> if ( !$update && username_exists( $user_login ) )
</span><del>- return new WP_Error('existing_user_login', __('This username is already registered.') );
</del><ins>+ return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
</ins><span class="cx">
</span><span class="cx"> if ( empty($user_nicename) )
</span><span class="cx"> $user_nicename = sanitize_title( $user_login );
</span><span class="lines">@@ -1320,7 +1320,7 @@
</span><span class="cx"> $user_email = apply_filters('pre_user_email', $user_email);
</span><span class="cx">
</span><span class="cx"> if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) )
</span><del>- return new WP_Error('existing_user_email', __('This email address is already registered.') );
</del><ins>+ return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
</ins><span class="cx">
</span><span class="cx"> if ( empty($nickname) )
</span><span class="cx"> $nickname = $user_login;
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (22123 => 22124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2012-10-05 16:34:32 UTC (rev 22123)
+++ trunk/wp-login.php 2012-10-05 19:04:34 UTC (rev 22124)
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx"> $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
</span><span class="cx"> $sanitized_user_login = '';
</span><span class="cx"> } elseif ( username_exists( $sanitized_user_login ) ) {
</span><del>- $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.' ) );
</del><ins>+ $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Check the e-mail address
</span></span></pre>
</div>
</div>
</body>
</html>