Changeset 6188

Show
Ignore:
Timestamp:
10/04/07 19:38:35 (1 year ago)
Author:
markjaquith
Message:

Some error message normalization from Viper007Bond and DD32. fixes #5139

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/includes/user.php

    r6026 r6188  
    8888    } else { 
    8989        if ((empty ( $pass1 ) && !empty ( $pass2 ) ) || (empty ( $pass2 ) && !empty ( $pass1 ) ) ) 
    90             $errors->add( 'pass', __( "<strong>ERROR</strong>: you typed your new password only once." )); 
     90            $errors->add( 'pass', __( '<strong>ERROR</strong>: You entered your new password only once.' )); 
    9191    } 
    9292 
    …… 
    9797    /* checking the password has been typed twice the same */ 
    9898    if ( $pass1 != $pass2 ) 
    99         $errors->add( 'pass', __( '<strong>ERROR</strong>: Please type the same password in the two password fields.' )); 
     99        $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in the two password fields.' )); 
    100100 
    101101    if (!empty ( $pass1 )) 
    …… 
    103103 
    104104    if ( !$update && !validate_username( $user->user_login ) ) 
    105         $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid. Please enter a valid username.' )); 
     105        $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid. Please enter a valid username.' )); 
    106106 
    107107    if (!$update && username_exists( $user->user_login )) 
    108         $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered, please choose another one.' )); 
     108        $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' )); 
    109109 
    110110    /* checking e-mail address */ 
    111111    if ( empty ( $user->user_email ) ) { 
    112         $errors->add( 'user_email', __( "<strong>ERROR</strong>: please type an e-mail address" )); 
     112        $errors->add( 'user_email', __( '<strong>ERROR</strong>: Please enter an e-mail address.' )); 
    113113    } else 
    114114        if (!is_email( $user->user_email ) ) { 
    115             $errors->add( 'user_email', __( "<strong>ERROR</strong>: the email address isn't correct" )); 
     115            $errors->add( 'user_email', __( "<strong>ERROR</strong>: The e-mail address isn't correct." )); 
    116116        } 
    117117