WordPress.org

Make WordPress Core

Changeset 22124


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

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

Location:
trunk
Files:
7 edited

Legend:

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

    r22092 r22124  
    225225    if ( $current_user->user_email != $_POST['email'] ) {
    226226        if ( !is_email( $_POST['email'] ) ) {
    227             $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) );
     227            $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address isn&#8217;t correct." ), array( 'form-field' => 'email' ) );
    228228            return;
    229229        }
    230230
    231231        if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_email FROM {$wpdb->users} WHERE user_email=%s", $_POST['email'] ) ) ) {
    232             $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address is already used." ), array( 'form-field' => 'email' ) );
     232            $errors->add( 'user_email', __( "<strong>ERROR</strong>: The email address is already used." ), array( 'form-field' => 'email' ) );
    233233            delete_option( $current_user->ID . '_new_email' );
    234234            return;
  • trunk/wp-admin/includes/user.php

    r21798 r22124  
    145145        $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) );
    146146    } elseif ( !is_email( $user->user_email ) ) {
    147         $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The e-mail address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
     147        $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
    148148    } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
    149149        $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

    r22042 r22124  
    128128                echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
    129129            <?php }
    130             echo '<p>' . __( 'Only the characters a-z and 0-9 recommended.' ) . '</p>';
     130            echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
    131131            ?>
    132132            </td>
  • trunk/wp-admin/setup-config.php

    r21873 r22124  
    166166        $$key = trim( stripslashes( $_POST[ $key ] ) );
    167167
    168     $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>';
     168    $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>';
    169169
    170170    if ( empty( $prefix ) )
  • 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;
  • trunk/wp-includes/user.php

    r21995 r22124  
    13061306
    13071307    if ( !$update && username_exists( $user_login ) )
    1308         return new WP_Error('existing_user_login', __('This username is already registered.') );
     1308        return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
    13091309
    13101310    if ( empty($user_nicename) )
     
    13211321
    13221322    if ( !$update && ! defined( 'WP_IMPORTING' ) && email_exists($user_email) )
    1323         return new WP_Error('existing_user_email', __('This email address is already registered.') );
     1323        return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
    13241324
    13251325    if ( empty($nickname) )
  • trunk/wp-login.php

    r22000 r22124  
    316316        $sanitized_user_login = '';
    317317    } elseif ( username_exists( $sanitized_user_login ) ) {
    318         $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.' ) );
     318        $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
    319319    }
    320320
Note: See TracChangeset for help on using the changeset viewer.