Changeset 22124

Timestamp:

10/05/2012 07:04:34 PM (14 years ago)

Author:

ryan

Message:

Consolidate some strings. Props pavelevap, SergeyBiryukov. see #21728

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/includes/user.php (modified) (1 diff)
• wp-admin/network/site-new.php (modified) (1 diff)
• wp-admin/setup-config.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (7 diffs)
• wp-includes/user.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/includes/ms.php

@@ -225 +225 @@
         if ( $current_user->user_email != $_POST['email'] ) {
                 if ( !is_email( $_POST['email'] ) ) {
-                        $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
+                        $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address isn&#8217;t correct." ), array( 'form-field' => 'email' ) );
                         return;
                 }
 
                 if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
-                        $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address is already used." ), array( 'form-field' => 'email' ) );
+                        $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address is already used." ), array( 'form-field' => 'email' ) );
                         delete_option( $current_user->ID . '_new_email' );
                         return;

trunk/wp-admin/includes/user.php

@@ -145 +145 @@
                 $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
         } elseif ( !is_email( $user->user_email ) ) {
-                $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
+                $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
         } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
                 $errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );

trunk/wp-admin/network/site-new.php

@@ -128 +128 @@
                                 echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
                         <?php }
-                        echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
+                        echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
                         ?>
                         </td>

trunk/wp-admin/setup-config.php

@@ -166 +166 @@
                 $$key = trim( stripslashes( $_POST[ $key ] ) );
 
-        $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>';
+        $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>';
 
         if ( empty( $prefix ) )

trunk/wp-includes/ms-functions.php

@@ -183 +183 @@
         if ( ! $user ) {
                 restore_current_blog();
-                return new WP_Error('user_does_not_exist', __('That user does not exist.'));
+                return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
         }
 
@@ -463 +463 @@
 
         if ( !is_email( $user_email ) )
-                $errors->add('user_email', __( 'Please enter a correct email address.' ) );
+                $errors->add('user_email', __( 'Please enter a valid email address.' ) );
 
         $limited_email_domains = get_site_option( 'limited_email_domains' );
@@ -474 +474 @@
         // Check if the username has been used already.
         if ( username_exists($user_name) )
-                $errors->add('user_name', __('Sorry, that username already exists!'));
+                $errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
 
         // Check if the email address has been used already.
         if ( email_exists($user_email) )
-                $errors->add('user_email', __('Sorry, that email address is already used!'));
+                $errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
 
         // Has someone already signed up for this username?
@@ -554 +554 @@
 
         if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
-                $errors->add('blogname', __( 'Only lowercase letters and numbers allowed.' ) );
+                $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
 
         if ( in_array( $blogname, $illegal_names ) == true )
@@ -591 +591 @@
         }
         if ( domain_exists($mydomain, $path, $current_site->id) )
-                $errors->add('blogname', __('Sorry, that site already exists!'));
+                $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
 
         if ( username_exists( $blogname ) ) {
@@ -957 +957 @@
         // Check if the domain has been used already. We should return an error message.
         if ( domain_exists($domain, $path, $site_id) )
-                return new WP_Error('blog_taken', __('Site already exists.'));
+                return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
 
         if ( !defined('WP_INSTALLING') )
@@ -1630 +1630 @@
 
         if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-                wp_die( __('Please try again!') );
+                wp_die( __( 'Please try again.' ) );
 
         return $result;

trunk/wp-includes/user.php

@@ -1306 +1306 @@
 
         if ( !$update && username_exists( $user_login ) )
-                return new WP_Error('existing_user_login', __('This username is already registered.') );
+                return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
 
         if ( empty($user_nicename) )
@@ -1321 +1321 @@
 
         if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) )
-                return new WP_Error('existing_user_email', __('This email address is already registered.') );
+                return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
 
         if ( empty($nickname) )

trunk/wp-login.php

@@ -316 +316 @@
                 $sanitized_user_login = '';
         } elseif ( username_exists( $sanitized_user_login ) ) {
-                $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.' ) );
+                $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
         }