Changeset 22124 for trunk/wp-includes/ms-functions.php

Timestamp:

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

Author:

ryan

Message:

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

File:

• trunk/wp-includes/ms-functions.php (modified) (7 diffs)

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;