diff --git a/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js b/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js index 65d96690c6..b40cf89781 100644 --- a/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js +++ b/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js @@ -24,7 +24,7 @@ clipboard_msg: "Copy/Cut/Paste is not available in Mozilla and Firefox.", clipboard_no_support: "Currently not supported by your browser, use keyboard shortcuts instead.", popup_blocked: "Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.", - invalid_data: "ERROR: Invalid values entered, these are marked in red.", + invalid_data: "Error: Invalid values entered, these are marked in red.", invalid_data_number: "{#field} must be a number", invalid_data_min: "{#field} must be a number greater than {#min}", invalid_data_size: "{#field} must be a number or percentage", diff --git a/src/wp-admin/import.php b/src/wp-admin/import.php index cc4246d65c..7931126458 100644 --- a/src/wp-admin/import.php +++ b/src/wp-admin/import.php @@ -61,7 +61,7 @@ $parent_file = 'tools.php';

-

+

' . esc_html( $_GET['invalid'] ) . '' ); diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php index 531d8ad3f6..b8716377b9 100644 --- a/src/wp-admin/includes/ajax-actions.php +++ b/src/wp-admin/includes/ajax-actions.php @@ -1272,7 +1272,7 @@ function wp_ajax_replyto_comment( $action ) { if ( empty( $post->post_status ) ) { wp_die( 1 ); } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ) ) ) { - wp_die( __( 'ERROR: You are replying to a comment on a draft post.' ) ); + wp_die( __( 'Error: You are replying to a comment on a draft post.' ) ); } $user = wp_get_current_user(); @@ -1302,7 +1302,7 @@ function wp_ajax_replyto_comment( $action ) { } if ( '' == $comment_content ) { - wp_die( __( 'ERROR: Please type a comment.' ) ); + wp_die( __( 'Error: Please type a comment.' ) ); } $comment_parent = 0; @@ -1404,7 +1404,7 @@ function wp_ajax_edit_comment() { } if ( '' == $_POST['content'] ) { - wp_die( __( 'ERROR: Please type a comment.' ) ); + wp_die( __( 'Error: Please type a comment.' ) ); } if ( isset( $_POST['status'] ) ) { diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index 98bcd6484c..bbf1368844 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -2074,7 +2074,7 @@ function request_filesystem_credentials( $form_post, $type = '', $error = false, $connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : ''; if ( $error ) { - $error_string = __( 'ERROR: There was an error connecting to the server, Please verify the settings are correct.' ); + $error_string = __( 'Error: There was an error connecting to the server, Please verify the settings are correct.' ); if ( is_wp_error( $error ) ) { $error_string = esc_html( $error->get_error_message() ); } diff --git a/src/wp-admin/includes/network.php b/src/wp-admin/includes/network.php index 82ea4e8e66..9dc665eda8 100644 --- a/src/wp-admin/includes/network.php +++ b/src/wp-admin/includes/network.php @@ -110,7 +110,7 @@ function network_step1( $errors = false ) { global $is_apache; if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { - echo '

' . __( 'ERROR:' ) . ' ' . sprintf( + echo '

' . __( 'Error:' ) . ' ' . sprintf( /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */ __( 'The constant %s cannot be defined when creating a network.' ), 'DO_NOT_UPGRADE_GLOBAL_TABLES' @@ -136,7 +136,7 @@ function network_step1( $errors = false ) { $hostname = get_clean_basedomain(); $has_ports = strstr( $hostname, ':' ); if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) { - echo '

' . __( 'ERROR:' ) . ' ' . __( 'You cannot install a network of sites with your server address.' ) . '

'; + echo '

' . __( 'Error:' ) . ' ' . __( 'You cannot install a network of sites with your server address.' ) . '

'; echo '

' . sprintf( /* translators: %s: Port number. */ __( 'You cannot use port numbers such as %s.' ), @@ -154,7 +154,7 @@ function network_step1( $errors = false ) { $error_codes = array(); if ( is_wp_error( $errors ) ) { - echo '

' . __( 'ERROR: The network could not be created.' ) . '

'; + echo '

' . __( 'Error: The network could not be created.' ) . '

'; foreach ( $errors->get_error_messages() as $error ) { echo "

$error

"; } diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php index 8c7c181a20..d37da01327 100644 --- a/src/wp-admin/includes/user.php +++ b/src/wp-admin/includes/user.php @@ -144,12 +144,12 @@ function edit_user( $user_id = 0 ) { /* checking that username has been typed */ if ( $user->user_login == '' ) { - $errors->add( 'user_login', __( 'ERROR: Please enter a username.' ) ); + $errors->add( 'user_login', __( 'Error: Please enter a username.' ) ); } /* checking that nickname has been typed */ if ( $update && empty( $user->nickname ) ) { - $errors->add( 'nickname', __( 'ERROR: Please enter a nickname.' ) ); + $errors->add( 'nickname', __( 'Error: Please enter a nickname.' ) ); } /** @@ -165,17 +165,17 @@ function edit_user( $user_id = 0 ) { // Check for blank password when adding a user. if ( ! $update && empty( $pass1 ) ) { - $errors->add( 'pass', __( 'ERROR: Please enter a password.' ), array( 'form-field' => 'pass1' ) ); + $errors->add( 'pass', __( 'Error: Please enter a password.' ), array( 'form-field' => 'pass1' ) ); } // Check for "\" in password. if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) { - $errors->add( 'pass', __( 'ERROR: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) ); + $errors->add( 'pass', __( 'Error: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) ); } // Checking the password has been typed twice the same. if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) { - $errors->add( 'pass', __( 'ERROR: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); + $errors->add( 'pass', __( 'Error: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); } if ( ! empty( $pass1 ) ) { @@ -183,29 +183,29 @@ function edit_user( $user_id = 0 ) { } if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) { - $errors->add( 'user_login', __( 'ERROR: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); + $errors->add( 'user_login', __( 'Error: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); } if ( ! $update && username_exists( $user->user_login ) ) { - $errors->add( 'user_login', __( 'ERROR: This username is already registered. Please choose another one.' ) ); + $errors->add( 'user_login', __( 'Error: This username is already registered. Please choose another one.' ) ); } /** This filter is documented in wp-includes/user.php */ $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() ); if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) { - $errors->add( 'invalid_username', __( 'ERROR: Sorry, that username is not allowed.' ) ); + $errors->add( 'invalid_username', __( 'Error: Sorry, that username is not allowed.' ) ); } /* checking email address */ if ( empty( $user->user_email ) ) { - $errors->add( 'empty_email', __( 'ERROR: Please enter an email address.' ), array( 'form-field' => 'email' ) ); + $errors->add( 'empty_email', __( 'Error: Please enter an email address.' ), array( 'form-field' => 'email' ) ); } elseif ( ! is_email( $user->user_email ) ) { - $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); + $errors->add( 'invalid_email', __( 'Error: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); } else { $owner_id = email_exists( $user->user_email ); if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) { - $errors->add( 'email_exists', __( 'ERROR: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) ); + $errors->add( 'email_exists', __( 'Error: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) ); } } diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php index 8a8d7b8f06..f04667f178 100644 --- a/src/wp-admin/options.php +++ b/src/wp-admin/options.php @@ -217,7 +217,7 @@ if ( 'update' == $action ) { } if ( ! isset( $whitelist_options[ $option_page ] ) ) { - wp_die( __( 'ERROR: Options page not found.' ) ); + wp_die( __( 'Error: Options page not found.' ) ); } if ( 'options' == $option_page ) { diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php index 27a234a74c..f31bdcb1f0 100644 --- a/src/wp-admin/setup-config.php +++ b/src/wp-admin/setup-config.php @@ -278,12 +278,12 @@ switch ( $step ) { $tryagain_link = '

' . __( 'Try Again' ) . ''; if ( empty( $prefix ) ) { - wp_die( __( 'ERROR: "Table Prefix" must not be empty.' ) . $tryagain_link ); + wp_die( __( 'Error: "Table Prefix" must not be empty.' ) . $tryagain_link ); } // Validate $prefix: it can only contain letters, numbers and underscores. if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) { - wp_die( __( 'ERROR: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link ); + wp_die( __( 'Error: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link ); } // Test the DB connection. @@ -316,7 +316,7 @@ switch ( $step ) { $wpdb->show_errors( $errors ); if ( ! $wpdb->last_error ) { // MySQL was able to parse the prefix as a value, which we don't want. Bail. - wp_die( __( 'ERROR: "Table Prefix" is invalid.' ) ); + wp_die( __( 'Error: "Table Prefix" is invalid.' ) ); } // Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password(). diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php index bffe381cdb..bf424e93ff 100644 --- a/src/wp-admin/themes.php +++ b/src/wp-admin/themes.php @@ -233,7 +233,7 @@ if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) { $ct = wp_get_theme(); if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { - echo '

' . __( 'ERROR:' ) . ' ' . $ct->errors()->get_error_message() . '

'; + echo '

' . __( 'Error:' ) . ' ' . $ct->errors()->get_error_message() . '

'; } /* diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php index ff7220c312..e62af90d90 100644 --- a/src/wp-admin/users.php +++ b/src/wp-admin/users.php @@ -274,7 +274,7 @@ switch ( $wp_list_table->current_action() ) {

-

+

diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php index dba5cb3d6b..80419b9786 100644 --- a/src/wp-includes/class-wp-theme.php +++ b/src/wp-includes/class-wp-theme.php @@ -253,7 +253,7 @@ final class WP_Theme implements ArrayAccess { ) ); if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one. - $this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) ); + $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or doesn’t exist. Please check your installation.' ) ); } return; } elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) { diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php index 18ff53e3af..924f6e7f70 100644 --- a/src/wp-includes/comment.php +++ b/src/wp-includes/comment.php @@ -1224,19 +1224,19 @@ function wp_check_comment_data_max_lengths( $comment_data ) { $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'] ) { - return new WP_Error( 'comment_author_column_length', __( 'ERROR: Your name is too long.' ), 200 ); + return new WP_Error( 'comment_author_column_length', __( 'Error: Your name is too long.' ), 200 ); } 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', __( 'ERROR: Your email address is too long.' ), 200 ); + return new WP_Error( 'comment_author_email_column_length', __( 'Error: 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'] ) { - return new WP_Error( 'comment_author_url_column_length', __( 'ERROR: Your url is too long.' ), 200 ); + return new WP_Error( 'comment_author_url_column_length', __( 'Error: Your URL is too long.' ), 200 ); } 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', __( 'ERROR: Your comment is too long.' ), 200 ); + return new WP_Error( 'comment_content_column_length', __( 'Error: Your comment is too long.' ), 200 ); } return true; @@ -3352,9 +3352,9 @@ function wp_handle_comment_submission( $comment_data ) { if ( get_option( 'require_name_email' ) && ! $user->exists() ) { if ( '' == $comment_author_email || '' == $comment_author ) { - return new WP_Error( 'require_name_email', __( 'ERROR: Please fill the required fields (name, email).' ), 200 ); + return new WP_Error( 'require_name_email', __( 'Error: Please fill the required fields (name, email).' ), 200 ); } elseif ( ! is_email( $comment_author_email ) ) { - return new WP_Error( 'require_valid_email', __( 'ERROR: Please enter a valid email address.' ), 200 ); + return new WP_Error( 'require_valid_email', __( 'Error: Please enter a valid email address.' ), 200 ); } } @@ -3379,7 +3379,7 @@ function wp_handle_comment_submission( $comment_data ) { */ $allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata ); if ( '' === $comment_content && ! $allow_empty_comment ) { - return new WP_Error( 'require_valid_comment', __( 'ERROR: Please type a comment.' ), 200 ); + return new WP_Error( 'require_valid_comment', __( 'Error: Please type a comment.' ), 200 ); } $check_max_lengths = wp_check_comment_data_max_lengths( $commentdata ); @@ -3393,7 +3393,7 @@ function wp_handle_comment_submission( $comment_data ) { } if ( ! $comment_id ) { - return new WP_Error( 'comment_save_error', __( 'ERROR: The comment could not be saved. Please try again later.' ), 500 ); + return new WP_Error( 'comment_save_error', __( 'Error: The comment could not be saved. Please try again later.' ), 500 ); } return get_comment( $comment_id ); diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php index ee478b742d..2da63160fd 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -1543,7 +1543,7 @@ function do_feed() { } if ( ! has_action( "do_feed_{$feed}" ) ) { - wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) ); + wp_die( __( 'Error: This is not a valid feed template.' ), '', array( 'response' => 404 ) ); } /** diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php index 9a24cfad4b..3cd95a3d14 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -489,7 +489,7 @@ function wp_set_wpdb_vars() { wp_die( sprintf( /* translators: 1: $table_prefix, 2: wp-config.php */ - __( 'ERROR: %1$s in %2$s can only contain numbers, letters, and underscores.' ), + __( 'Error: %1$s in %2$s can only contain numbers, letters, and underscores.' ), '$table_prefix', 'wp-config.php' ) diff --git a/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php index 45141105da..b7fa528e5c 100644 --- a/src/wp-includes/ms-deprecated.php +++ b/src/wp-includes/ms-deprecated.php @@ -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. if ( domain_exists($domain, $path, $site_id) ) - return __( 'ERROR: Site URL already taken.' ); + return __( 'Error: Site URL already taken.' ); /* * 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) ) - return __( 'ERROR: Problem creating site entry.' ); + return __( 'Error: Problem creating site entry.' ); switch_to_blog($blog_id); install_blog($blog_id); diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php index b16447073d..3646526d8f 100644 --- a/src/wp-includes/pluggable.php +++ b/src/wp-includes/pluggable.php @@ -541,7 +541,7 @@ if ( ! function_exists( 'wp_authenticate' ) ) : if ( $user == null ) { // TODO: What should the error message be? (Or would these even happen?) // Only needed if all authentication handlers fail to return anything. - $user = new WP_Error( 'authentication_failed', __( 'ERROR: Invalid username, email address or incorrect password.' ) ); + $user = new WP_Error( 'authentication_failed', __( 'Error: Invalid username, email address or incorrect password.' ) ); } $ignore_codes = array( 'empty_username', 'empty_password' ); diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php index 33249b5a53..73968ef77e 100644 --- a/src/wp-includes/user.php +++ b/src/wp-includes/user.php @@ -134,11 +134,11 @@ function wp_authenticate_username_password( $user, $username, $password ) { $error = new WP_Error(); if ( empty( $username ) ) { - $error->add( 'empty_username', __( 'ERROR: The username field is empty.' ) ); + $error->add( 'empty_username', __( 'Error: The username field is empty.' ) ); } if ( empty( $password ) ) { - $error->add( 'empty_password', __( 'ERROR: The password field is empty.' ) ); + $error->add( 'empty_password', __( 'Error: The password field is empty.' ) ); } return $error; @@ -172,7 +172,7 @@ function wp_authenticate_username_password( $user, $username, $password ) { 'incorrect_password', sprintf( /* translators: %s: User name. */ - __( 'ERROR: The password you entered for the username %s is incorrect.' ), + __( 'Error: The password you entered for the username %s is incorrect.' ), '' . $username . '' ) . ' ' . @@ -209,11 +209,11 @@ function wp_authenticate_email_password( $user, $email, $password ) { if ( empty( $email ) ) { // Uses 'empty_username' for back-compat with wp_signon(). - $error->add( 'empty_username', __( 'ERROR: The email field is empty.' ) ); + $error->add( 'empty_username', __( 'Error: The email field is empty.' ) ); } if ( empty( $password ) ) { - $error->add( 'empty_password', __( 'ERROR: The password field is empty.' ) ); + $error->add( 'empty_password', __( 'Error: The password field is empty.' ) ); } return $error; @@ -244,7 +244,7 @@ function wp_authenticate_email_password( $user, $email, $password ) { 'incorrect_password', sprintf( /* translators: %s: Email address. */ - __( 'ERROR: The password you entered for the email address %s is incorrect.' ), + __( 'Error: The password you entered for the email address %s is incorrect.' ), '' . $email . '' ) . ' ' . @@ -319,7 +319,7 @@ function wp_authenticate_spam_check( $user ) { $spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user ); if ( $spammed ) { - return new WP_Error( 'spammer_account', __( 'ERROR: Your account has been marked as a spammer.' ) ); + return new WP_Error( 'spammer_account', __( 'Error: Your account has been marked as a spammer.' ) ); } } return $user; @@ -2265,7 +2265,7 @@ function get_password_reset_key( $user ) { global $wp_hasher; if ( ! ( $user instanceof WP_User ) ) { - return new WP_Error( 'invalidcombo', __( 'ERROR: There is no account with that username or email address.' ) ); + return new WP_Error( 'invalidcombo', __( 'Error: There is no account with that username or email address.' ) ); } /** @@ -2494,29 +2494,29 @@ function register_new_user( $user_login, $user_email ) { // Check the username. if ( $sanitized_user_login == '' ) { - $errors->add( 'empty_username', __( 'ERROR: Please enter a username.' ) ); + $errors->add( 'empty_username', __( 'Error: Please enter a username.' ) ); } elseif ( ! validate_username( $user_login ) ) { - $errors->add( 'invalid_username', __( 'ERROR: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); + $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.' ) ); } else { /** This filter is documented in wp-includes/user.php */ $illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() ); if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) { - $errors->add( 'invalid_username', __( 'ERROR: Sorry, that username is not allowed.' ) ); + $errors->add( 'invalid_username', __( 'Error: Sorry, that username is not allowed.' ) ); } } // Check the email address. if ( $user_email == '' ) { - $errors->add( 'empty_email', __( 'ERROR: Please type your email address.' ) ); + $errors->add( 'empty_email', __( 'Error: Please type your email address.' ) ); } elseif ( ! is_email( $user_email ) ) { - $errors->add( 'invalid_email', __( 'ERROR: The email address isn’t correct.' ) ); + $errors->add( 'invalid_email', __( 'Error: The email address isn’t correct.' ) ); $user_email = ''; } elseif ( email_exists( $user_email ) ) { - $errors->add( 'email_exists', __( 'ERROR: This email is already registered, please choose another one.' ) ); + $errors->add( 'email_exists', __( 'Error: This email is already registered, please choose another one.' ) ); } /** @@ -2561,7 +2561,7 @@ function register_new_user( $user_login, $user_email ) { 'registerfail', sprintf( /* translators: %s: Admin email address. */ - __( 'ERROR: Couldn’t register you… please contact the webmaster !' ), + __( 'Error: Couldn’t register you… please contact the webmaster !' ), get_option( 'admin_email' ) ) ); @@ -2796,7 +2796,7 @@ function send_confirmation_on_profile_email() { if ( ! is_email( $_POST['email'] ) ) { $errors->add( 'user_email', - __( 'ERROR: The email address isn’t correct.' ), + __( 'Error: The email address isn’t correct.' ), array( 'form-field' => 'email', ) @@ -2808,7 +2808,7 @@ function send_confirmation_on_profile_email() { if ( email_exists( $_POST['email'] ) ) { $errors->add( 'user_email', - __( 'ERROR: The email address is already used.' ), + __( 'Error: The email address is already used.' ), array( 'form-field' => 'email', ) diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php index 81755639f0..66897a05b2 100644 --- a/src/wp-includes/wp-db.php +++ b/src/wp-includes/wp-db.php @@ -3498,7 +3498,7 @@ class wpdb { // Make sure the server has the required MySQL version. if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) { /* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */ - return new WP_Error( 'database_version', sprintf( __( 'ERROR: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) ); + return new WP_Error( 'database_version', sprintf( __( 'Error: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) ); } } diff --git a/src/wp-login.php b/src/wp-login.php index fabc0cb2e8..cc7a53d014 100644 --- a/src/wp-login.php +++ b/src/wp-login.php @@ -367,11 +367,11 @@ function retrieve_password() { $user_data = false; if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) { - $errors->add( 'empty_username', __( 'ERROR: Enter a username or email address.' ) ); + $errors->add( 'empty_username', __( 'Error: Enter a username or email address.' ) ); } elseif ( strpos( $_POST['user_login'], '@' ) ) { $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) ); if ( empty( $user_data ) ) { - $errors->add( 'invalid_email', __( 'ERROR: There is no account with that username or email address.' ) ); + $errors->add( 'invalid_email', __( 'Error: There is no account with that username or email address.' ) ); } } else { $login = trim( wp_unslash( $_POST['user_login'] ) ); @@ -396,7 +396,7 @@ function retrieve_password() { } if ( ! $user_data ) { - $errors->add( 'invalidcombo', __( 'ERROR: There is no account with that username or email address.' ) ); + $errors->add( 'invalidcombo', __( 'Error: There is no account with that username or email address.' ) ); return $errors; } @@ -463,7 +463,7 @@ function retrieve_password() { 'retrieve_password_email_failure', sprintf( /* translators: %s: Documentation URL. */ - __( 'ERROR: The email could not be sent. Your site may not be correctly configured to send emails. Get support for resetting your password.' ), + __( 'Error: The email could not be sent. Your site may not be correctly configured to send emails. Get support for resetting your password.' ), esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) ) ) ); @@ -1206,7 +1206,7 @@ switch ( $action ) { 'test_cookie', sprintf( /* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */ - __( 'ERROR: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums.' ), + __( 'Error: Cookies are blocked due to unexpected output. For help, please see this documentation or try the support forums.' ), __( 'https://wordpress.org/support/article/cookies/' ), __( 'https://wordpress.org/support/forums/' ) ) @@ -1217,7 +1217,7 @@ switch ( $action ) { 'test_cookie', sprintf( /* translators: %s: Browser cookie documentation URL. */ - __( 'ERROR: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.' ), + __( 'Error: Cookies are blocked or not supported by your browser. You must enable cookies to use WordPress.' ), __( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' ) ) ); diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php index aa68eb1495..a15ad5e69e 100644 --- a/tests/phpunit/includes/bootstrap.php +++ b/tests/phpunit/includes/bootstrap.php @@ -30,7 +30,7 @@ if ( defined( 'WP_TESTS_CONFIG_FILE_PATH' ) ) { global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer, $wp_theme_directories; if ( ! is_readable( $config_file_path ) ) { - echo "ERROR: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n"; + echo "Error: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n"; exit( 1 ); } @@ -39,7 +39,7 @@ require_once dirname( __FILE__ ) . '/functions.php'; if ( version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) { printf( - "ERROR: Looks like you're using PHPUnit %s. WordPress is currently only compatible with PHPUnit up to 7.x.\n", + "Error: Looks like you're using PHPUnit %s. WordPress is currently only compatible with PHPUnit up to 7.x.\n", tests_get_phpunit_version() ); echo "Please use the latest PHPUnit version from the 7.x branch.\n"; @@ -47,7 +47,7 @@ if ( version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) { } if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) { - echo "ERROR: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n"; + echo "Error: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n"; exit( 1 ); } diff --git a/tests/phpunit/includes/trac.php b/tests/phpunit/includes/trac.php index 4ffa90f20d..84617fa661 100644 --- a/tests/phpunit/includes/trac.php +++ b/tests/phpunit/includes/trac.php @@ -47,14 +47,14 @@ class TracTickets { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid public static function usingLocalCache() { echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K"; - echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL; + echo 'Info: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL; echo "\x1b[0m\x1b[2K"; } // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid public static function forcingKnownBugs() { echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K"; - echo "ERROR: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL; + echo "Error: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL; echo "\x1b[0m\x1b[2K"; } } diff --git a/tests/phpunit/tests/ajax/ReplytoComment.php b/tests/phpunit/tests/ajax/ReplytoComment.php index 1499a26b2e..52591a44fa 100644 --- a/tests/phpunit/tests/ajax/ReplytoComment.php +++ b/tests/phpunit/tests/ajax/ReplytoComment.php @@ -187,7 +187,7 @@ class Tests_Ajax_ReplytoComment extends WP_Ajax_UnitTestCase { $_POST['comment_post_ID'] = self::$draft_post->ID; // Make the request. - $this->setExpectedException( 'WPAjaxDieStopException', 'ERROR: You are replying to a comment on a draft post.' ); + $this->setExpectedException( 'WPAjaxDieStopException', 'Error: You are replying to a comment on a draft post.' ); $this->_handleAjax( 'replyto-comment' ); }