From 8d5ca186c2896f945629d3d7cbee01589aa03641 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Fri, 5 Oct 2012 19:04:34 +0000 Subject: [PATCH] Consolidate some strings. Props pavelevap, SergeyBiryukov. see #21728 git-svn-id: https://develop.svn.wordpress.org/trunk@22124 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/ms.php | 4 ++-- wp-admin/includes/user.php | 2 +- wp-admin/network/site-new.php | 2 +- wp-admin/setup-config.php | 2 +- wp-includes/ms-functions.php | 16 ++++++++-------- wp-includes/user.php | 4 ++-- wp-login.php | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 971f5ada94..e195988b12 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -224,12 +224,12 @@ function send_confirmation_on_profile_email() { if ( $current_user->user_email != $_POST['email'] ) { if ( !is_email( $_POST['email'] ) ) { - $errors->add( 'user_email', __( "ERROR: The e-mail address isn't correct." ), array( 'form-field' => 'email' ) ); + $errors->add( 'user_email', __( "ERROR: The email address isn’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', __( "ERROR: The e-mail address is already used." ), array( 'form-field' => 'email' ) ); + $errors->add( 'user_email', __( "ERROR: The email address is already used." ), array( 'form-field' => 'email' ) ); delete_option( $current_user->ID . '_new_email' ); return; } diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php index 6a12ed072e..1d60aa57e3 100644 --- a/wp-admin/includes/user.php +++ b/wp-admin/includes/user.php @@ -144,7 +144,7 @@ function edit_user( $user_id = 0 ) { if ( empty( $user->user_email ) ) { $errors->add( 'empty_email', __( 'ERROR: Please enter an e-mail address.' ), array( 'form-field' => 'email' ) ); } elseif ( !is_email( $user->user_email ) ) { - $errors->add( 'invalid_email', __( 'ERROR: The e-mail address isn’t correct.' ), array( 'form-field' => 'email' ) ); + $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); } elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) { $errors->add( 'email_exists', __('ERROR: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) ); } diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php index adf50db6b5..645e28f905 100644 --- a/wp-admin/network/site-new.php +++ b/wp-admin/network/site-new.php @@ -127,7 +127,7 @@ if ( ! empty( $messages ) ) { domain . $current_site->path ?> ' . __( 'Only the characters a-z and 0-9 recommended.' ) . '

'; + echo '

' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '

'; ?> diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index ac5d404974..5e1cf94784 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -165,7 +165,7 @@ switch($step) { foreach ( array( 'dbname', 'uname', 'pwd', 'dbhost', 'prefix' ) as $key ) $$key = trim( stripslashes( $_POST[ $key ] ) ); - $tryagain_link = '

' . __( 'Try Again' ) . ''; + $tryagain_link = '

' . __( 'Try again' ) . ''; if ( empty( $prefix ) ) wp_die( __( 'ERROR: "Table Prefix" must not be empty.' . $tryagain_link ) ); diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 3f522e9de0..822e56c2b9 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -182,7 +182,7 @@ function add_user_to_blog( $blog_id, $user_id, $role ) { 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.' ) ); } if ( !get_user_meta($user_id, 'primary_blog', true) ) { @@ -462,7 +462,7 @@ function wpmu_validate_user_signup($user_name, $user_email) { $errors->add('user_name', __('Sorry, usernames must have letters too!')); 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' ); if ( is_array( $limited_email_domains ) && empty( $limited_email_domains ) == false ) { @@ -473,11 +473,11 @@ function wpmu_validate_user_signup($user_name, $user_email) { // 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? $signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) ); @@ -553,7 +553,7 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') { $errors->add('blogname', __( 'Please enter a site name.' ) ); 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 ) $errors->add('blogname', __( 'That name is not allowed.' ) ); @@ -590,7 +590,7 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') { $path = $base.$blogname.'/'; } 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 ) ) { if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) ) @@ -956,7 +956,7 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id // 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') ) define( 'WP_INSTALLING', true ); @@ -1629,7 +1629,7 @@ function signup_nonce_check( $result ) { return $result; 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; } diff --git a/wp-includes/user.php b/wp-includes/user.php index 943ad24e33..b38fbb5e26 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -1305,7 +1305,7 @@ function wp_insert_user( $userdata ) { return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') ); 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) ) $user_nicename = sanitize_title( $user_login ); @@ -1320,7 +1320,7 @@ function wp_insert_user( $userdata ) { $user_email = apply_filters('pre_user_email', $user_email); 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) ) $nickname = $user_login; diff --git a/wp-login.php b/wp-login.php index d95c49bbfe..842cd31d1f 100644 --- a/wp-login.php +++ b/wp-login.php @@ -315,7 +315,7 @@ function register_new_user( $user_login, $user_email ) { $errors->add( 'invalid_username', __( 'ERROR: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); $sanitized_user_login = ''; } elseif ( username_exists( $sanitized_user_login ) ) { - $errors->add( 'username_exists', __( 'ERROR: This username is already registered, please choose another one.' ) ); + $errors->add( 'username_exists', __( 'ERROR: This username is already registered. Please choose another one.' ) ); } // Check the e-mail address