Text Changes: Improve consistency of admin error notices.
This changeset replaces `<strong>Error</strong>:` with `<strong>Error:</strong>`, for better consistency. Props transl8or, mihaidumitrascu, audrasjb. Fixes #50785. Built from https://develop.svn.wordpress.org/trunk@53458 git-svn-id: http://core.svn.wordpress.org/trunk@53047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
6f2e2a33be
commit
bbe60d66c3
|
@ -2302,7 +2302,7 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false,
|
||||||
$connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
|
$connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
|
||||||
|
|
||||||
if ( $error ) {
|
if ( $error ) {
|
||||||
$error_string = __( '<strong>Error</strong>: Could not connect to the server. Please verify the settings are correct.' );
|
$error_string = __( '<strong>Error:</strong> Could not connect to the server. Please verify the settings are correct.' );
|
||||||
if ( is_wp_error( $error ) ) {
|
if ( is_wp_error( $error ) ) {
|
||||||
$error_string = esc_html( $error->get_error_message() );
|
$error_string = esc_html( $error->get_error_message() );
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,12 +143,12 @@ function edit_user( $user_id = 0 ) {
|
||||||
|
|
||||||
/* checking that username has been typed */
|
/* checking that username has been typed */
|
||||||
if ( '' === $user->user_login ) {
|
if ( '' === $user->user_login ) {
|
||||||
$errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
|
$errors->add( 'user_login', __( '<strong>Error:</strong> Please enter a username.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* checking that nickname has been typed */
|
/* checking that nickname has been typed */
|
||||||
if ( $update && empty( $user->nickname ) ) {
|
if ( $update && empty( $user->nickname ) ) {
|
||||||
$errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
|
$errors->add( 'nickname', __( '<strong>Error:</strong> Please enter a nickname.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -164,17 +164,17 @@ function edit_user( $user_id = 0 ) {
|
||||||
|
|
||||||
// Check for blank password when adding a user.
|
// Check for blank password when adding a user.
|
||||||
if ( ! $update && empty( $pass1 ) ) {
|
if ( ! $update && empty( $pass1 ) ) {
|
||||||
$errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
|
$errors->add( 'pass', __( '<strong>Error:</strong> Please enter a password.' ), array( 'form-field' => 'pass1' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for "\" in password.
|
// Check for "\" in password.
|
||||||
if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
|
if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
|
||||||
$errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
|
$errors->add( 'pass', __( '<strong>Error:</strong> Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Checking the password has been typed twice the same.
|
// Checking the password has been typed twice the same.
|
||||||
if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
|
if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
|
||||||
$errors->add( 'pass', __( '<strong>Error</strong>: Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
|
$errors->add( 'pass', __( '<strong>Error:</strong> Passwords do not match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! empty( $pass1 ) ) {
|
if ( ! empty( $pass1 ) ) {
|
||||||
|
@ -182,29 +182,29 @@ function edit_user( $user_id = 0 ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
|
if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
|
||||||
$errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
|
$errors->add( 'user_login', __( '<strong>Error:</strong> This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! $update && username_exists( $user->user_login ) ) {
|
if ( ! $update && username_exists( $user->user_login ) ) {
|
||||||
$errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
|
$errors->add( 'user_login', __( '<strong>Error:</strong> This username is already registered. Please choose another one.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/** This filter is documented in wp-includes/user.php */
|
/** This filter is documented in wp-includes/user.php */
|
||||||
$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
|
$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
|
||||||
|
|
||||||
if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
|
if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
|
||||||
$errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
|
$errors->add( 'invalid_username', __( '<strong>Error:</strong> Sorry, that username is not allowed.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/* checking email address */
|
/* checking email address */
|
||||||
if ( empty( $user->user_email ) ) {
|
if ( empty( $user->user_email ) ) {
|
||||||
$errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
|
$errors->add( 'empty_email', __( '<strong>Error:</strong> Please enter an email address.' ), array( 'form-field' => 'email' ) );
|
||||||
} elseif ( ! is_email( $user->user_email ) ) {
|
} elseif ( ! is_email( $user->user_email ) ) {
|
||||||
$errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address is not correct.' ), array( 'form-field' => 'email' ) );
|
$errors->add( 'invalid_email', __( '<strong>Error:</strong> The email address is not correct.' ), array( 'form-field' => 'email' ) );
|
||||||
} else {
|
} else {
|
||||||
$owner_id = email_exists( $user->user_email );
|
$owner_id = email_exists( $user->user_email );
|
||||||
if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
|
if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
|
||||||
$errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
|
$errors->add( 'email_exists', __( '<strong>Error:</strong> This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -278,12 +278,12 @@ switch ( $step ) {
|
||||||
$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
|
$tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
|
||||||
|
|
||||||
if ( empty( $prefix ) ) {
|
if ( empty( $prefix ) ) {
|
||||||
wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
|
wp_die( __( '<strong>Error:</strong> "Table Prefix" must not be empty.' ) . $tryagain_link );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Validate $prefix: it can only contain letters, numbers and underscores.
|
// Validate $prefix: it can only contain letters, numbers and underscores.
|
||||||
if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
|
if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
|
||||||
wp_die( __( '<strong>Error</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
|
wp_die( __( '<strong>Error:</strong> "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Test the DB connection.
|
// Test the DB connection.
|
||||||
|
@ -316,7 +316,7 @@ switch ( $step ) {
|
||||||
$wpdb->show_errors( $errors );
|
$wpdb->show_errors( $errors );
|
||||||
if ( ! $wpdb->last_error ) {
|
if ( ! $wpdb->last_error ) {
|
||||||
// MySQL was able to parse the prefix as a value, which we don't want. Bail.
|
// MySQL was able to parse the prefix as a value, which we don't want. Bail.
|
||||||
wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) );
|
wp_die( __( '<strong>Error:</strong> "Table Prefix" is invalid.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
|
// Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
|
||||||
|
|
|
@ -1270,19 +1270,19 @@ function wp_check_comment_data_max_lengths( $comment_data ) {
|
||||||
$max_lengths = wp_get_comment_fields_max_lengths();
|
$max_lengths = wp_get_comment_fields_max_lengths();
|
||||||
|
|
||||||
if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
|
if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
|
||||||
return new WP_Error( 'comment_author_column_length', __( '<strong>Error</strong>: Your name is too long.' ), 200 );
|
return new WP_Error( 'comment_author_column_length', __( '<strong>Error:</strong> Your name is too long.' ), 200 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
|
if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
|
||||||
return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error</strong>: Your email address is too long.' ), 200 );
|
return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error:</strong> Your email address is too long.' ), 200 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
|
if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
|
||||||
return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error</strong>: Your URL is too long.' ), 200 );
|
return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error:</strong> Your URL is too long.' ), 200 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
|
if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
|
||||||
return new WP_Error( 'comment_content_column_length', __( '<strong>Error</strong>: Your comment is too long.' ), 200 );
|
return new WP_Error( 'comment_content_column_length', __( '<strong>Error:</strong> Your comment is too long.' ), 200 );
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -3529,9 +3529,9 @@ function wp_handle_comment_submission( $comment_data ) {
|
||||||
|
|
||||||
if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
|
if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
|
||||||
if ( '' == $comment_author_email || '' == $comment_author ) {
|
if ( '' == $comment_author_email || '' == $comment_author ) {
|
||||||
return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields.' ), 200 );
|
return new WP_Error( 'require_name_email', __( '<strong>Error:</strong> Please fill the required fields.' ), 200 );
|
||||||
} elseif ( ! is_email( $comment_author_email ) ) {
|
} elseif ( ! is_email( $comment_author_email ) ) {
|
||||||
return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 );
|
return new WP_Error( 'require_valid_email', __( '<strong>Error:</strong> Please enter a valid email address.' ), 200 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3556,7 +3556,7 @@ function wp_handle_comment_submission( $comment_data ) {
|
||||||
*/
|
*/
|
||||||
$allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata );
|
$allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata );
|
||||||
if ( '' === $comment_content && ! $allow_empty_comment ) {
|
if ( '' === $comment_content && ! $allow_empty_comment ) {
|
||||||
return new WP_Error( 'require_valid_comment', __( '<strong>Error</strong>: Please type your comment text.' ), 200 );
|
return new WP_Error( 'require_valid_comment', __( '<strong>Error:</strong> Please type your comment text.' ), 200 );
|
||||||
}
|
}
|
||||||
|
|
||||||
$check_max_lengths = wp_check_comment_data_max_lengths( $commentdata );
|
$check_max_lengths = wp_check_comment_data_max_lengths( $commentdata );
|
||||||
|
@ -3570,7 +3570,7 @@ function wp_handle_comment_submission( $comment_data ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! $comment_id ) {
|
if ( ! $comment_id ) {
|
||||||
return new WP_Error( 'comment_save_error', __( '<strong>Error</strong>: The comment could not be saved. Please try again later.' ), 500 );
|
return new WP_Error( 'comment_save_error', __( '<strong>Error:</strong> The comment could not be saved. Please try again later.' ), 500 );
|
||||||
}
|
}
|
||||||
|
|
||||||
return get_comment( $comment_id );
|
return get_comment( $comment_id );
|
||||||
|
|
|
@ -624,7 +624,7 @@ function wp_set_wpdb_vars() {
|
||||||
wp_die(
|
wp_die(
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: 1: $table_prefix, 2: wp-config.php */
|
/* translators: 1: $table_prefix, 2: wp-config.php */
|
||||||
__( '<strong>Error</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
|
__( '<strong>Error:</strong> %1$s in %2$s can only contain numbers, letters, and underscores.' ),
|
||||||
'<code>$table_prefix</code>',
|
'<code>$table_prefix</code>',
|
||||||
'<code>wp-config.php</code>'
|
'<code>wp-config.php</code>'
|
||||||
)
|
)
|
||||||
|
|
|
@ -401,7 +401,7 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
|
||||||
|
|
||||||
// Check if the domain has been used already. We should return an error message.
|
// Check if the domain has been used already. We should return an error message.
|
||||||
if ( domain_exists($domain, $path, $site_id) )
|
if ( domain_exists($domain, $path, $site_id) )
|
||||||
return __( '<strong>Error</strong>: Site URL you’ve entered is already taken.' );
|
return __( '<strong>Error:</strong> Site URL you’ve entered is already taken.' );
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
|
* Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
|
||||||
|
@ -410,7 +410,7 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
|
if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
|
||||||
return __( '<strong>Error</strong>: There was a problem creating site entry.' );
|
return __( '<strong>Error:</strong> There was a problem creating site entry.' );
|
||||||
|
|
||||||
switch_to_blog($blog_id);
|
switch_to_blog($blog_id);
|
||||||
install_blog($blog_id);
|
install_blog($blog_id);
|
||||||
|
|
|
@ -622,7 +622,7 @@ if ( ! function_exists( 'wp_authenticate' ) ) :
|
||||||
if ( null == $user ) {
|
if ( null == $user ) {
|
||||||
// TODO: What should the error message be? (Or would these even happen?)
|
// TODO: What should the error message be? (Or would these even happen?)
|
||||||
// Only needed if all authentication handlers fail to return anything.
|
// Only needed if all authentication handlers fail to return anything.
|
||||||
$user = new WP_Error( 'authentication_failed', __( '<strong>Error</strong>: Invalid username, email address or incorrect password.' ) );
|
$user = new WP_Error( 'authentication_failed', __( '<strong>Error:</strong> Invalid username, email address or incorrect password.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
$ignore_codes = array( 'empty_username', 'empty_password' );
|
$ignore_codes = array( 'empty_username', 'empty_password' );
|
||||||
|
|
|
@ -134,11 +134,11 @@ function wp_authenticate_username_password( $user, $username, $password ) {
|
||||||
$error = new WP_Error();
|
$error = new WP_Error();
|
||||||
|
|
||||||
if ( empty( $username ) ) {
|
if ( empty( $username ) ) {
|
||||||
$error->add( 'empty_username', __( '<strong>Error</strong>: The username field is empty.' ) );
|
$error->add( 'empty_username', __( '<strong>Error:</strong> The username field is empty.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( empty( $password ) ) {
|
if ( empty( $password ) ) {
|
||||||
$error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
|
$error->add( 'empty_password', __( '<strong>Error:</strong> The password field is empty.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
return $error;
|
return $error;
|
||||||
|
@ -151,7 +151,7 @@ function wp_authenticate_username_password( $user, $username, $password ) {
|
||||||
'invalid_username',
|
'invalid_username',
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: %s: User name. */
|
/* translators: %s: User name. */
|
||||||
__( '<strong>Error</strong>: The username <strong>%s</strong> is not registered on this site. If you are unsure of your username, try your email address instead.' ),
|
__( '<strong>Error:</strong> The username <strong>%s</strong> is not registered on this site. If you are unsure of your username, try your email address instead.' ),
|
||||||
$username
|
$username
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -176,7 +176,7 @@ function wp_authenticate_username_password( $user, $username, $password ) {
|
||||||
'incorrect_password',
|
'incorrect_password',
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: %s: User name. */
|
/* translators: %s: User name. */
|
||||||
__( '<strong>Error</strong>: The password you entered for the username %s is incorrect.' ),
|
__( '<strong>Error:</strong> The password you entered for the username %s is incorrect.' ),
|
||||||
'<strong>' . $username . '</strong>'
|
'<strong>' . $username . '</strong>'
|
||||||
) .
|
) .
|
||||||
' <a href="' . wp_lostpassword_url() . '">' .
|
' <a href="' . wp_lostpassword_url() . '">' .
|
||||||
|
@ -213,11 +213,11 @@ function wp_authenticate_email_password( $user, $email, $password ) {
|
||||||
|
|
||||||
if ( empty( $email ) ) {
|
if ( empty( $email ) ) {
|
||||||
// Uses 'empty_username' for back-compat with wp_signon().
|
// Uses 'empty_username' for back-compat with wp_signon().
|
||||||
$error->add( 'empty_username', __( '<strong>Error</strong>: The email field is empty.' ) );
|
$error->add( 'empty_username', __( '<strong>Error:</strong> The email field is empty.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( empty( $password ) ) {
|
if ( empty( $password ) ) {
|
||||||
$error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
|
$error->add( 'empty_password', __( '<strong>Error:</strong> The password field is empty.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
return $error;
|
return $error;
|
||||||
|
@ -248,7 +248,7 @@ function wp_authenticate_email_password( $user, $email, $password ) {
|
||||||
'incorrect_password',
|
'incorrect_password',
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: %s: Email address. */
|
/* translators: %s: Email address. */
|
||||||
__( '<strong>Error</strong>: The password you entered for the email address %s is incorrect.' ),
|
__( '<strong>Error:</strong> The password you entered for the email address %s is incorrect.' ),
|
||||||
'<strong>' . $email . '</strong>'
|
'<strong>' . $email . '</strong>'
|
||||||
) .
|
) .
|
||||||
' <a href="' . wp_lostpassword_url() . '">' .
|
' <a href="' . wp_lostpassword_url() . '">' .
|
||||||
|
@ -351,12 +351,12 @@ function wp_authenticate_application_password( $input_user, $username, $password
|
||||||
if ( is_email( $username ) ) {
|
if ( is_email( $username ) ) {
|
||||||
$error = new WP_Error(
|
$error = new WP_Error(
|
||||||
'invalid_email',
|
'invalid_email',
|
||||||
__( '<strong>Error</strong>: Unknown email address. Check again or try your username.' )
|
__( '<strong>Error:</strong> Unknown email address. Check again or try your username.' )
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$error = new WP_Error(
|
$error = new WP_Error(
|
||||||
'invalid_username',
|
'invalid_username',
|
||||||
__( '<strong>Error</strong>: Unknown username. Check again or try your email address.' )
|
__( '<strong>Error:</strong> Unknown username. Check again or try your email address.' )
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
} elseif ( ! wp_is_application_passwords_available() ) {
|
} elseif ( ! wp_is_application_passwords_available() ) {
|
||||||
|
@ -503,7 +503,7 @@ function wp_authenticate_spam_check( $user ) {
|
||||||
$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user );
|
$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user );
|
||||||
|
|
||||||
if ( $spammed ) {
|
if ( $spammed ) {
|
||||||
return new WP_Error( 'spammer_account', __( '<strong>Error</strong>: Your account has been marked as a spammer.' ) );
|
return new WP_Error( 'spammer_account', __( '<strong>Error:</strong> Your account has been marked as a spammer.' ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $user;
|
return $user;
|
||||||
|
@ -2830,7 +2830,7 @@ function get_password_reset_key( $user ) {
|
||||||
global $wp_hasher;
|
global $wp_hasher;
|
||||||
|
|
||||||
if ( ! ( $user instanceof WP_User ) ) {
|
if ( ! ( $user instanceof WP_User ) ) {
|
||||||
return new WP_Error( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
|
return new WP_Error( 'invalidcombo', __( '<strong>Error:</strong> There is no account with that username or email address.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3025,11 +3025,11 @@ function retrieve_password( $user_login = null ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( empty( $user_login ) ) {
|
if ( empty( $user_login ) ) {
|
||||||
$errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username or email address.' ) );
|
$errors->add( 'empty_username', __( '<strong>Error:</strong> Please enter a username or email address.' ) );
|
||||||
} elseif ( strpos( $user_login, '@' ) ) {
|
} elseif ( strpos( $user_login, '@' ) ) {
|
||||||
$user_data = get_user_by( 'email', trim( wp_unslash( $user_login ) ) );
|
$user_data = get_user_by( 'email', trim( wp_unslash( $user_login ) ) );
|
||||||
if ( empty( $user_data ) ) {
|
if ( empty( $user_data ) ) {
|
||||||
$errors->add( 'invalid_email', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
|
$errors->add( 'invalid_email', __( '<strong>Error:</strong> There is no account with that username or email address.' ) );
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
$user_data = get_user_by( 'login', trim( wp_unslash( $user_login ) ) );
|
$user_data = get_user_by( 'login', trim( wp_unslash( $user_login ) ) );
|
||||||
|
@ -3083,7 +3083,7 @@ function retrieve_password( $user_login = null ) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( ! $user_data ) {
|
if ( ! $user_data ) {
|
||||||
$errors->add( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
|
$errors->add( 'invalidcombo', __( '<strong>Error:</strong> There is no account with that username or email address.' ) );
|
||||||
return $errors;
|
return $errors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3231,7 +3231,7 @@ function retrieve_password( $user_login = null ) {
|
||||||
'retrieve_password_email_failure',
|
'retrieve_password_email_failure',
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: %s: Documentation URL. */
|
/* translators: %s: Documentation URL. */
|
||||||
__( '<strong>Error</strong>: The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
|
__( '<strong>Error:</strong> The email could not be sent. Your site may not be correctly configured to send emails. <a href="%s">Get support for resetting your password</a>.' ),
|
||||||
esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
|
esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -3298,26 +3298,26 @@ function register_new_user( $user_login, $user_email ) {
|
||||||
|
|
||||||
// Check the username.
|
// Check the username.
|
||||||
if ( '' === $sanitized_user_login ) {
|
if ( '' === $sanitized_user_login ) {
|
||||||
$errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) );
|
$errors->add( 'empty_username', __( '<strong>Error:</strong> Please enter a username.' ) );
|
||||||
} elseif ( ! validate_username( $user_login ) ) {
|
} elseif ( ! validate_username( $user_login ) ) {
|
||||||
$errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
|
$errors->add( 'invalid_username', __( '<strong>Error:</strong> This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
|
||||||
$sanitized_user_login = '';
|
$sanitized_user_login = '';
|
||||||
} elseif ( username_exists( $sanitized_user_login ) ) {
|
} elseif ( username_exists( $sanitized_user_login ) ) {
|
||||||
$errors->add( 'username_exists', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
|
$errors->add( 'username_exists', __( '<strong>Error:</strong> This username is already registered. Please choose another one.' ) );
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
/** This filter is documented in wp-includes/user.php */
|
/** This filter is documented in wp-includes/user.php */
|
||||||
$illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );
|
$illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );
|
||||||
if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) {
|
if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) {
|
||||||
$errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
|
$errors->add( 'invalid_username', __( '<strong>Error:</strong> Sorry, that username is not allowed.' ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check the email address.
|
// Check the email address.
|
||||||
if ( '' === $user_email ) {
|
if ( '' === $user_email ) {
|
||||||
$errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) );
|
$errors->add( 'empty_email', __( '<strong>Error:</strong> Please type your email address.' ) );
|
||||||
} elseif ( ! is_email( $user_email ) ) {
|
} elseif ( ! is_email( $user_email ) ) {
|
||||||
$errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address is not correct.' ) );
|
$errors->add( 'invalid_email', __( '<strong>Error:</strong> The email address is not correct.' ) );
|
||||||
$user_email = '';
|
$user_email = '';
|
||||||
} elseif ( email_exists( $user_email ) ) {
|
} elseif ( email_exists( $user_email ) ) {
|
||||||
$errors->add(
|
$errors->add(
|
||||||
|
@ -3372,7 +3372,7 @@ function register_new_user( $user_login, $user_email ) {
|
||||||
'registerfail',
|
'registerfail',
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: %s: Admin email address. */
|
/* translators: %s: Admin email address. */
|
||||||
__( '<strong>Error</strong>: Could not register you… please contact the <a href="mailto:%s">site admin</a>!' ),
|
__( '<strong>Error:</strong> Could not register you… please contact the <a href="mailto:%s">site admin</a>!' ),
|
||||||
get_option( 'admin_email' )
|
get_option( 'admin_email' )
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -3615,7 +3615,7 @@ function send_confirmation_on_profile_email() {
|
||||||
if ( ! is_email( $_POST['email'] ) ) {
|
if ( ! is_email( $_POST['email'] ) ) {
|
||||||
$errors->add(
|
$errors->add(
|
||||||
'user_email',
|
'user_email',
|
||||||
__( '<strong>Error</strong>: The email address is not correct.' ),
|
__( '<strong>Error:</strong> The email address is not correct.' ),
|
||||||
array(
|
array(
|
||||||
'form-field' => 'email',
|
'form-field' => 'email',
|
||||||
)
|
)
|
||||||
|
@ -3627,7 +3627,7 @@ function send_confirmation_on_profile_email() {
|
||||||
if ( email_exists( $_POST['email'] ) ) {
|
if ( email_exists( $_POST['email'] ) ) {
|
||||||
$errors->add(
|
$errors->add(
|
||||||
'user_email',
|
'user_email',
|
||||||
__( '<strong>Error</strong>: The email address is already used.' ),
|
__( '<strong>Error:</strong> The email address is already used.' ),
|
||||||
array(
|
array(
|
||||||
'form-field' => 'email',
|
'form-field' => 'email',
|
||||||
)
|
)
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '6.1-alpha-53457';
|
$wp_version = '6.1-alpha-53458';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
|
|
@ -3697,7 +3697,7 @@ class wpdb {
|
||||||
// Make sure the server has the required MySQL version.
|
// Make sure the server has the required MySQL version.
|
||||||
if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) {
|
if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) {
|
||||||
/* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */
|
/* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */
|
||||||
return new WP_Error( 'database_version', sprintf( __( '<strong>Error</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
|
return new WP_Error( 'database_version', sprintf( __( '<strong>Error:</strong> WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
12
wp-login.php
12
wp-login.php
|
@ -790,9 +790,9 @@ switch ( $action ) {
|
||||||
|
|
||||||
if ( isset( $_GET['error'] ) ) {
|
if ( isset( $_GET['error'] ) ) {
|
||||||
if ( 'invalidkey' === $_GET['error'] ) {
|
if ( 'invalidkey' === $_GET['error'] ) {
|
||||||
$errors->add( 'invalidkey', __( '<strong>Error</strong>: Your password reset link appears to be invalid. Please request a new link below.' ) );
|
$errors->add( 'invalidkey', __( '<strong>Error:</strong> Your password reset link appears to be invalid. Please request a new link below.' ) );
|
||||||
} elseif ( 'expiredkey' === $_GET['error'] ) {
|
} elseif ( 'expiredkey' === $_GET['error'] ) {
|
||||||
$errors->add( 'expiredkey', __( '<strong>Error</strong>: Your password reset link has expired. Please request a new link below.' ) );
|
$errors->add( 'expiredkey', __( '<strong>Error:</strong> Your password reset link has expired. Please request a new link below.' ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -918,7 +918,7 @@ switch ( $action ) {
|
||||||
|
|
||||||
// Check if password fields do not match.
|
// Check if password fields do not match.
|
||||||
if ( ! empty( $_POST['pass1'] ) && trim( $_POST['pass2'] ) !== $_POST['pass1'] ) {
|
if ( ! empty( $_POST['pass1'] ) && trim( $_POST['pass2'] ) !== $_POST['pass1'] ) {
|
||||||
$errors->add( 'password_reset_mismatch', __( '<strong>Error</strong>: The passwords do not match.' ) );
|
$errors->add( 'password_reset_mismatch', __( '<strong>Error:</strong> The passwords do not match.' ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1226,7 +1226,7 @@ switch ( $action ) {
|
||||||
'test_cookie',
|
'test_cookie',
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */
|
/* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */
|
||||||
__( '<strong>Error</strong>: Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
|
__( '<strong>Error:</strong> Cookies are blocked due to unexpected output. For help, please see <a href="%1$s">this documentation</a> or try the <a href="%2$s">support forums</a>.' ),
|
||||||
__( 'https://wordpress.org/support/article/cookies/' ),
|
__( 'https://wordpress.org/support/article/cookies/' ),
|
||||||
__( 'https://wordpress.org/support/forums/' )
|
__( 'https://wordpress.org/support/forums/' )
|
||||||
)
|
)
|
||||||
|
@ -1237,7 +1237,7 @@ switch ( $action ) {
|
||||||
'test_cookie',
|
'test_cookie',
|
||||||
sprintf(
|
sprintf(
|
||||||
/* translators: %s: Browser cookie documentation URL. */
|
/* translators: %s: Browser cookie documentation URL. */
|
||||||
__( '<strong>Error</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
|
__( '<strong>Error:</strong> Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
|
||||||
__( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' )
|
__( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' )
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
@ -1341,7 +1341,7 @@ switch ( $action ) {
|
||||||
if ( isset( $_GET['loggedout'] ) && $_GET['loggedout'] ) {
|
if ( isset( $_GET['loggedout'] ) && $_GET['loggedout'] ) {
|
||||||
$errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' );
|
$errors->add( 'loggedout', __( 'You are now logged out.' ), 'message' );
|
||||||
} elseif ( isset( $_GET['registration'] ) && 'disabled' === $_GET['registration'] ) {
|
} elseif ( isset( $_GET['registration'] ) && 'disabled' === $_GET['registration'] ) {
|
||||||
$errors->add( 'registerdisabled', __( '<strong>Error</strong>: User registration is currently not allowed.' ) );
|
$errors->add( 'registerdisabled', __( '<strong>Error:</strong> User registration is currently not allowed.' ) );
|
||||||
} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
|
} elseif ( strpos( $redirect_to, 'about.php?updated' ) ) {
|
||||||
$errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what’s new.' ), 'message' );
|
$errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what’s new.' ), 'message' );
|
||||||
} elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {
|
} elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {
|
||||||
|
|
Loading…
Reference in New Issue