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 9687041853..9fcb177736 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: "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 7326f185c1..1404e1f7c1 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 7010262492..5e15ecc784 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' ), true ) ) { - wp_die( __( 'Error: You are replying to a comment on a draft post.' ) ); + wp_die( __( 'You can’t reply 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( __( 'Please type your comment text.' ) ); } $comment_parent = 0; @@ -1404,7 +1404,7 @@ function wp_ajax_edit_comment() { } if ( '' === $_POST['content'] ) { - wp_die( __( 'Error: Please type a comment.' ) ); + wp_die( __( 'Please type your comment text.' ) ); } if ( isset( $_POST['status'] ) ) { diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php index cca39895ba..e343e651fc 100644 --- a/src/wp-admin/includes/file.php +++ b/src/wp-admin/includes/file.php @@ -2099,7 +2099,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 = __( '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 481fd94982..f15aadd542 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 '

' . 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' ), true ) ) ) { - echo '

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

'; + echo '

' . __( '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 '

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

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

$error

"; } diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php index f58f6cb31a..f59787e7dd 100644 --- a/src/wp-admin/includes/plugin-install.php +++ b/src/wp-admin/includes/plugin-install.php @@ -801,7 +801,7 @@ function install_plugin_information() { if ( ! $compatible_php ) { echo '

'; - _e( 'Error: This plugin requires a newer version of PHP.' ); + _e( 'This plugin requires a newer version of PHP.' ); if ( current_user_can( 'update_php' ) ) { printf( /* translators: %s: URL to Update PHP page. */ @@ -822,7 +822,7 @@ function install_plugin_information() { echo '

'; } elseif ( ! $compatible_wp ) { echo '

'; - _e( 'Error: This plugin requires a newer version of WordPress.' ); + _e( 'This plugin requires a newer version of WordPress.' ); if ( current_user_can( 'update_core' ) ) { printf( /* translators: %s: URL to WordPress Updates screen. */ diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php index ca3f1fc054..426d11df0e 100644 --- a/src/wp-admin/includes/plugin.php +++ b/src/wp-admin/includes/plugin.php @@ -1152,7 +1152,7 @@ function validate_plugin_requirements( $plugin ) { 'plugin_wp_php_incompatible', sprintf( /* translators: %s: Plugin name. */ - _x( 'Error: Current WordPress and PHP versions do not meet minimum requirements for %s.', 'plugin' ), + _x( 'Current WordPress and PHP versions do not meet minimum requirements for %s.', 'plugin' ), $plugin_headers['Name'] ) ); @@ -1161,7 +1161,7 @@ function validate_plugin_requirements( $plugin ) { 'plugin_php_incompatible', sprintf( /* translators: %s: Plugin name. */ - _x( 'Error: Current PHP version does not meet minimum requirements for %s.', 'plugin' ), + _x( 'Current PHP version does not meet minimum requirements for %s.', 'plugin' ), $plugin_headers['Name'] ) ); @@ -1170,7 +1170,7 @@ function validate_plugin_requirements( $plugin ) { 'plugin_wp_incompatible', sprintf( /* translators: %s: Plugin name. */ - _x( 'Error: Current WordPress version does not meet minimum requirements for %s.', 'plugin' ), + _x( 'Current WordPress version does not meet minimum requirements for %s.', 'plugin' ), $plugin_headers['Name'] ) ); diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php index 2268f75e55..4cb5e4a791 100644 --- a/src/wp-admin/includes/user.php +++ b/src/wp-admin/includes/user.php @@ -143,12 +143,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', __( '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', __( 'Please enter a nickname.' ) ); } /** @@ -164,17 +164,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', __( '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', __( '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', __( 'Passwords don’t match. Please enter the same password in both password fields.' ), array( 'form-field' => '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'] ) ) { - $errors->add( 'user_login', __( 'Error: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); + $errors->add( 'user_login', __( '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', __( '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', __( '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', __( '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', __( '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', __( '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 4b02b673c3..dafdd691d8 100644 --- a/src/wp-admin/options.php +++ b/src/wp-admin/options.php @@ -221,7 +221,7 @@ if ( 'update' === $action ) { // We are saving settings sent from a settings pag wp_die( sprintf( /* translators: %s: The options page name. */ - __( 'Error: Options page %s not found in the options whitelist.' ), + __( 'Options page %s not found in the options whitelist.' ), '' . esc_html( $option_page ) . '' ) ); diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php index b721f8158d..a428f00b04 100644 --- a/src/wp-admin/setup-config.php +++ b/src/wp-admin/setup-config.php @@ -280,12 +280,12 @@ switch ( $step ) { $tryagain_link = '

' . __( 'Try Again' ) . ''; if ( empty( $prefix ) ) { - wp_die( __( 'Error: "Table Prefix" must not be empty.' ) . $tryagain_link ); + wp_die( __( '"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( __( '"Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link ); } // Test the DB connection. @@ -318,7 +318,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( __( '"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 0f632d06cc..bb3912bd6a 100644 --- a/src/wp-admin/themes.php +++ b/src/wp-admin/themes.php @@ -280,7 +280,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 '

' . $ct->errors()->get_error_message() . '

'; } /* diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php index 3742e95276..bea003c378 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 ca6359ec7e..9ffef81219 100644 --- a/src/wp-includes/class-wp-theme.php +++ b/src/wp-includes/class-wp-theme.php @@ -255,7 +255,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', __( '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 a001eabad7..ed3bc80e9b 100644 --- a/src/wp-includes/comment.php +++ b/src/wp-includes/comment.php @@ -1239,19 +1239,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', __( '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', __( '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', __( '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', __( 'Your comment is too long.' ), 200 ); } return true; @@ -3382,9 +3382,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', __( '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', __( 'Please enter a valid email address.' ), 200 ); } } @@ -3409,7 +3409,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', __( 'Please type your comment text.' ), 200 ); } $check_max_lengths = wp_check_comment_data_max_lengths( $commentdata ); @@ -3423,7 +3423,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', __( '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 2edb6a6a11..2895a03cbb 100644 --- a/src/wp-includes/functions.php +++ b/src/wp-includes/functions.php @@ -1551,7 +1551,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( __( '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 b12a9c458f..3381f5eb3b 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -548,7 +548,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.' ), + __( '%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 85399342c2..3bdb6cb995 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 __( '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. @@ -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 __( 'There was a 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 c2579659df..3b99d5e6b2 100644 --- a/src/wp-includes/pluggable.php +++ b/src/wp-includes/pluggable.php @@ -546,7 +546,7 @@ if ( ! function_exists( 'wp_authenticate' ) ) : if ( null == $user ) { // 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', __( 'Invalid username, email address or incorrect password.' ) ); } $ignore_codes = array( 'empty_username', 'empty_password' ); diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php index 48ccd29013..46317ff4b4 100644 --- a/src/wp-includes/theme.php +++ b/src/wp-includes/theme.php @@ -930,7 +930,7 @@ function validate_theme_requirements( $stylesheet ) { 'theme_wp_php_incompatible', sprintf( /* translators: %s: Theme name. */ - _x( 'Error: Current WordPress and PHP versions do not meet minimum requirements for %s.', 'theme' ), + _x( 'Current WordPress and PHP versions do not meet minimum requirements for %s.', 'theme' ), $theme->display( 'Name' ) ) ); @@ -939,7 +939,7 @@ function validate_theme_requirements( $stylesheet ) { 'theme_php_incompatible', sprintf( /* translators: %s: Theme name. */ - _x( 'Error: Current PHP version does not meet minimum requirements for %s.', 'theme' ), + _x( 'Current PHP version does not meet minimum requirements for %s.', 'theme' ), $theme->display( 'Name' ) ) ); @@ -948,7 +948,7 @@ function validate_theme_requirements( $stylesheet ) { 'theme_wp_incompatible', sprintf( /* translators: %s: Theme name. */ - _x( 'Error: Current WordPress version does not meet minimum requirements for %s.', 'theme' ), + _x( 'Current WordPress version does not meet minimum requirements for %s.', 'theme' ), $theme->display( 'Name' ) ) ); diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php index e0645493a2..3a83ca9159 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', __( 'The username field is empty.' ) ); } if ( empty( $password ) ) { - $error->add( 'empty_password', __( 'Error: The password field is empty.' ) ); + $error->add( 'empty_password', __( '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.' ), + __( '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', __( 'The email field is empty.' ) ); } if ( empty( $password ) ) { - $error->add( 'empty_password', __( 'Error: The password field is empty.' ) ); + $error->add( 'empty_password', __( '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.' ), + __( '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', __( 'Your account has been marked as a spammer.' ) ); } } return $user; @@ -2278,7 +2278,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', __( 'There is no account with that username or email address.' ) ); } /** @@ -2507,29 +2507,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', __( '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', __( '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', __( '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', __( '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', __( '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', __( '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', __( 'This email is already registered. Please choose another one.' ) ); } /** @@ -2574,7 +2574,7 @@ function register_new_user( $user_login, $user_email ) { 'registerfail', sprintf( /* translators: %s: Admin email address. */ - __( 'Error: Couldn’t register you… please contact the site admin!' ), + __( 'Couldn’t register you… please contact the webmaster!' ), get_option( 'admin_email' ) ) ); @@ -2809,7 +2809,7 @@ function send_confirmation_on_profile_email() { if ( ! is_email( $_POST['email'] ) ) { $errors->add( 'user_email', - __( 'Error: The email address isn’t correct.' ), + __( 'The email address isn’t correct.' ), array( 'form-field' => 'email', ) @@ -2821,7 +2821,7 @@ function send_confirmation_on_profile_email() { if ( email_exists( $_POST['email'] ) ) { $errors->add( 'user_email', - __( 'Error: The email address is already used.' ), + __( '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 76e93ad81d..54c7c0b4e6 100644 --- a/src/wp-includes/wp-db.php +++ b/src/wp-includes/wp-db.php @@ -3530,7 +3530,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( __( '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 f289c35d4b..51cd7de3ac 100644 --- a/src/wp-login.php +++ b/src/wp-login.php @@ -358,11 +358,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', __( 'Please 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', __( 'There is no account with that username or email address.' ) ); } } else { $login = trim( wp_unslash( $_POST['user_login'] ) ); @@ -387,7 +387,7 @@ function retrieve_password() { } if ( ! $user_data ) { - $errors->add( 'invalidcombo', __( 'Error: There is no account with that username or email address.' ) ); + $errors->add( 'invalidcombo', __( 'There is no account with that username or email address.' ) ); return $errors; } @@ -454,7 +454,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.' ), + __( '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/' ) ) ) ); @@ -1197,7 +1197,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.' ), + __( '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/' ) ) @@ -1208,7 +1208,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.' ), + __( '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 d628d62c09..460454b1b7 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 "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 __DIR__ . '/functions.php'; if ( version_compare( tests_get_phpunit_version(), '5.4', '<' ) || version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) { printf( - "Error: Looks like you're using PHPUnit %s. WordPress requires at least PHPUnit 5.4 and is currently only compatible with PHPUnit up to 7.x.\n", + "Looks like you're using PHPUnit %s. WordPress requires at least PHPUnit 5.4 and 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(), '5.4', '<' ) || version_compa } 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 "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 84617fa661..c901362bb9 100644 --- a/tests/phpunit/includes/trac.php +++ b/tests/phpunit/includes/trac.php @@ -54,7 +54,7 @@ class TracTickets { // 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 "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 d0cabef41e..935cbe8ea1 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', 'You can’t reply to a comment on a draft post.' ); $this->_handleAjax( 'replyto-comment' ); }