WordPress.org

Make WordPress Core


Ignore:
Timestamp:
10/05/2012 07:04:34 PM (8 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-functions.php

    r22121 r22124  
    183183    if ( ! $user ) {
    184184        restore_current_blog();
    185         return new WP_Error('user_does_not_exist', __('That user does not exist.'));
     185        return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
    186186    }
    187187
     
    463463
    464464    if ( !is_email( $user_email ) )
    465         $errors->add('user_email', __( 'Please enter a correct email address.' ) );
     465        $errors->add('user_email', __( 'Please enter a valid email address.' ) );
    466466
    467467    $limited_email_domains = get_site_option( 'limited_email_domains' );
     
    474474    // Check if the username has been used already.
    475475    if ( username_exists($user_name) )
    476         $errors->add('user_name', __('Sorry, that username already exists!'));
     476        $errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
    477477
    478478    // Check if the email address has been used already.
    479479    if ( email_exists($user_email) )
    480         $errors->add('user_email', __('Sorry, that email address is already used!'));
     480        $errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
    481481
    482482    // Has someone already signed up for this username?
     
    554554
    555555    if ( preg_match( '/[^a-z0-9]+/', $blogname ) )
    556         $errors->add('blogname', __( 'Only lowercase letters and numbers allowed.' ) );
     556        $errors->add('blogname', __( 'Only lowercase letters (a-z) and numbers are allowed.' ) );
    557557
    558558    if ( in_array( $blogname, $illegal_names ) == true )
     
    591591    }
    592592    if ( domain_exists($mydomain, $path, $current_site->id) )
    593         $errors->add('blogname', __('Sorry, that site already exists!'));
     593        $errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
    594594
    595595    if ( username_exists( $blogname ) ) {
     
    957957    // Check if the domain has been used already. We should return an error message.
    958958    if ( domain_exists($domain, $path, $site_id) )
    959         return new WP_Error('blog_taken', __('Site already exists.'));
     959        return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
    960960
    961961    if ( !defined('WP_INSTALLING') )
     
    16301630
    16311631    if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
    1632         wp_die( __('Please try again!') );
     1632        wp_die( __( 'Please try again.' ) );
    16331633
    16341634    return $result;
Note: See TracChangeset for help on using the changeset viewer.