WordPress.org

Make WordPress Core

Ticket #47656: 47656.2.diff

File 47656.2.diff, 35.8 KB (added by audrasjb, 14 months ago)

Patch refresh

  • src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js

    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 b  
    2424                        clipboard_msg: "Copy/Cut/Paste is not available in Mozilla and Firefox.",
    2525                        clipboard_no_support: "Currently not supported by your browser, use keyboard shortcuts instead.",
    2626                        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.",
    27                         invalid_data: "Error: Invalid values entered, these are marked in red.",
     27                        invalid_data: "Invalid values entered, these are marked in red.",
    2828                        invalid_data_number: "{#field} must be a number",
    2929                        invalid_data_min: "{#field} must be a number greater than {#min}",
    3030                        invalid_data_size: "{#field} must be a number or percentage",
  • src/wp-admin/import.php

    diff --git a/src/wp-admin/import.php b/src/wp-admin/import.php
    index 7326f185c1..1404e1f7c1 100644
    a b $parent_file = 'tools.php'; 
    6161<h1><?php echo esc_html( $title ); ?></h1>
    6262<?php if ( ! empty( $_GET['invalid'] ) ) : ?>
    6363        <div class="error">
    64                 <p><strong><?php _e( 'Error:' ); ?></strong>
     64                <p>
    6565                        <?php
    6666                        /* translators: %s: Importer slug. */
    6767                        printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
  • src/wp-admin/includes/ajax-actions.php

    diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php
    index 7010262492..25a8b2b078 100644
    a b function wp_ajax_replyto_comment( $action ) { 
    12721272        if ( empty( $post->post_status ) ) {
    12731273                wp_die( 1 );
    12741274        } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ), true ) ) {
    1275                 wp_die( __( 'Error: You are replying to a comment on a draft post.' ) );
     1275                wp_die( __( 'You can’t reply to a comment on a draft post.' ) );
    12761276        }
    12771277
    12781278        $user = wp_get_current_user();
    function wp_ajax_replyto_comment( $action ) { 
    13021302        }
    13031303
    13041304        if ( '' === $comment_content ) {
    1305                 wp_die( __( 'Error: Please type a comment.' ) );
     1305                wp_die( __( 'Please type your comment text.' ) );
    13061306        }
    13071307
    13081308        $comment_parent = 0;
    function wp_ajax_edit_comment() { 
    14041404        }
    14051405
    14061406        if ( '' === $_POST['content'] ) {
    1407                 wp_die( __( 'Error: Please type a comment.' ) );
     1407                wp_die( __( 'Please type your comment text.' ) );
    14081408        }
    14091409
    14101410        if ( isset( $_POST['status'] ) ) {
  • src/wp-admin/includes/file.php

    diff --git a/src/wp-admin/includes/file.php b/src/wp-admin/includes/file.php
    index cca39895ba..e343e651fc 100644
    a b function request_filesystem_credentials( $form_post, $type = '', $error = false, 
    20992099        $connection_type = isset( $credentials['connection_type'] ) ? $credentials['connection_type'] : '';
    21002100
    21012101        if ( $error ) {
    2102                 $error_string = __( '<strong>Error</strong>: There was an error connecting to the server. Please verify the settings are correct.' );
     2102                $error_string = __( 'There was an error connecting to the server. Please verify the settings are correct.' );
    21032103                if ( is_wp_error( $error ) ) {
    21042104                        $error_string = esc_html( $error->get_error_message() );
    21052105                }
  • src/wp-admin/includes/network.php

    diff --git a/src/wp-admin/includes/network.php b/src/wp-admin/includes/network.php
    index 481fd94982..f15aadd542 100644
    a b function network_step1( $errors = false ) { 
    110110        global $is_apache;
    111111
    112112        if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
    113                 echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf(
     113                echo '<div class="error"><p>' . sprintf(
    114114                        /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
    115115                        __( 'The constant %s cannot be defined when creating a network.' ),
    116116                        '<code>DO_NOT_UPGRADE_GLOBAL_TABLES</code>'
    function network_step1( $errors = false ) { 
    136136        $hostname  = get_clean_basedomain();
    137137        $has_ports = strstr( $hostname, ':' );
    138138        if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) {
    139                 echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
     139                echo '<div class="error"><p><strong>' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
    140140                echo '<p>' . sprintf(
    141141                        /* translators: %s: Port number. */
    142142                        __( 'You cannot use port numbers such as %s.' ),
    function network_step1( $errors = false ) { 
    154154
    155155        $error_codes = array();
    156156        if ( is_wp_error( $errors ) ) {
    157                 echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
     157                echo '<div class="error"><p><strong>' . __( 'The network could not be created.' ) . '</strong></p>';
    158158                foreach ( $errors->get_error_messages() as $error ) {
    159159                        echo "<p>$error</p>";
    160160                }
  • src/wp-admin/includes/plugin-install.php

    diff --git a/src/wp-admin/includes/plugin-install.php b/src/wp-admin/includes/plugin-install.php
    index f58f6cb31a..f59787e7dd 100644
    a b function install_plugin_information() { 
    801801
    802802        if ( ! $compatible_php ) {
    803803                echo '<div class="notice notice-error notice-alt"><p>';
    804                 _e( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>.' );
     804                _e( 'This plugin <strong>requires a newer version of PHP</strong>.' );
    805805                if ( current_user_can( 'update_php' ) ) {
    806806                        printf(
    807807                                /* translators: %s: URL to Update PHP page. */
    function install_plugin_information() { 
    822822                echo '</p></div>';
    823823        } elseif ( ! $compatible_wp ) {
    824824                echo '<div class="notice notice-error notice-alt"><p>';
    825                 _e( '<strong>Error:</strong> This plugin <strong>requires a newer version of WordPress</strong>.' );
     825                _e( 'This plugin <strong>requires a newer version of WordPress</strong>.' );
    826826                if ( current_user_can( 'update_core' ) ) {
    827827                        printf(
    828828                                /* translators: %s: URL to WordPress Updates screen. */
  • src/wp-admin/includes/plugin.php

    diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php
    index ca3f1fc054..426d11df0e 100644
    a b function validate_plugin_requirements( $plugin ) { 
    11521152                        'plugin_wp_php_incompatible',
    11531153                        sprintf(
    11541154                                /* translators: %s: Plugin name. */
    1155                                 _x( '<strong>Error:</strong> Current WordPress and PHP versions do not meet minimum requirements for %s.', 'plugin' ),
     1155                                _x( 'Current WordPress and PHP versions do not meet minimum requirements for %s.', 'plugin' ),
    11561156                                $plugin_headers['Name']
    11571157                        )
    11581158                );
    function validate_plugin_requirements( $plugin ) { 
    11611161                        'plugin_php_incompatible',
    11621162                        sprintf(
    11631163                                /* translators: %s: Plugin name. */
    1164                                 _x( '<strong>Error:</strong> Current PHP version does not meet minimum requirements for %s.', 'plugin' ),
     1164                                _x( 'Current PHP version does not meet minimum requirements for %s.', 'plugin' ),
    11651165                                $plugin_headers['Name']
    11661166                        )
    11671167                );
    function validate_plugin_requirements( $plugin ) { 
    11701170                        'plugin_wp_incompatible',
    11711171                        sprintf(
    11721172                                /* translators: %s: Plugin name. */
    1173                                 _x( '<strong>Error:</strong> Current WordPress version does not meet minimum requirements for %s.', 'plugin' ),
     1173                                _x( 'Current WordPress version does not meet minimum requirements for %s.', 'plugin' ),
    11741174                                $plugin_headers['Name']
    11751175                        )
    11761176                );
  • src/wp-admin/includes/user.php

    diff --git a/src/wp-admin/includes/user.php b/src/wp-admin/includes/user.php
    index 2268f75e55..1c3d44cc16 100644
    a b function edit_user( $user_id = 0 ) { 
    143143
    144144        /* checking that username has been typed */
    145145        if ( '' === $user->user_login ) {
    146                 $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
     146                $errors->add( 'user_login', __( 'Please enter a username.' ) );
    147147        }
    148148
    149149        /* checking that nickname has been typed */
    150150        if ( $update && empty( $user->nickname ) ) {
    151                 $errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
     151                $errors->add( 'nickname', __( 'Please enter a nickname.' ) );
    152152        }
    153153
    154154        /**
    function edit_user( $user_id = 0 ) { 
    164164
    165165        // Check for blank password when adding a user.
    166166        if ( ! $update && empty( $pass1 ) ) {
    167                 $errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
     167                $errors->add( 'pass', __( 'Please enter a password.' ), array( 'form-field' => 'pass1' ) );
    168168        }
    169169
    170170        // Check for "\" in password.
    171171        if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
    172                 $errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
     172                $errors->add( 'pass', __( 'Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
    173173        }
    174174
    175175        // Checking the password has been typed twice the same.
    176176        if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
    177                 $errors->add( 'pass', __( '<strong>Error</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
     177                $errors->add( 'pass', __( 'Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
    178178        }
    179179
    180180        if ( ! empty( $pass1 ) ) {
    function edit_user( $user_id = 0 ) { 
    182182        }
    183183
    184184        if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
    185                 $errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
     185                $errors->add( 'user_login', __( 'This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
    186186        }
    187187
    188188        if ( ! $update && username_exists( $user->user_login ) ) {
    189                 $errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
     189                $errors->add( 'user_login', __( 'This username is already registered. Please choose another one.' ) );
    190190        }
    191191
    192192        /** This filter is documented in wp-includes/user.php */
    193193        $illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
    194194
    195195        if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
    196                 $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
     196                $errors->add( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
    197197        }
    198198
    199199        /* checking email address */
    200200        if ( empty( $user->user_email ) ) {
    201                 $errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
     201                $errors->add( 'empty_email', __( 'Please enter an email address.' ), array( 'form-field' => 'email' ) );
    202202        } elseif ( ! is_email( $user->user_email ) ) {
    203                 $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
     203                $errors->add( 'invalid_email', __( 'The email address isn’t correct.' ), array( 'form-field' => 'email' ) );
    204204        } else {
    205205                $owner_id = email_exists( $user->user_email );
    206206                if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
    207                         $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
     207                        $errors->add( 'email_exists', __( 'This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );
    208208                }
    209209        }
    210210
  • src/wp-admin/options.php

    diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php
    index 4b02b673c3..dafdd691d8 100644
    a b if ( 'update' === $action ) { // We are saving settings sent from a settings pag 
    221221                wp_die(
    222222                        sprintf(
    223223                                /* translators: %s: The options page name. */
    224                                 __( '<strong>Error</strong>: Options page %s not found in the options whitelist.' ),
     224                                __( 'Options page %s not found in the options whitelist.' ),
    225225                                '<code>' . esc_html( $option_page ) . '</code>'
    226226                        )
    227227                );
  • src/wp-admin/setup-config.php

    diff --git a/src/wp-admin/setup-config.php b/src/wp-admin/setup-config.php
    index b721f8158d..a428f00b04 100644
    a b switch ( $step ) { 
    280280                $tryagain_link = '</p><p class="step"><a href="' . $step_1 . '" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try Again' ) . '</a>';
    281281
    282282                if ( empty( $prefix ) ) {
    283                         wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
     283                        wp_die( __( '"Table Prefix" must not be empty.' ) . $tryagain_link );
    284284                }
    285285
    286286                // Validate $prefix: it can only contain letters, numbers and underscores.
    287287                if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
    288                         wp_die( __( '<strong>Error</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
     288                        wp_die( __( '"Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
    289289                }
    290290
    291291                // Test the DB connection.
    switch ( $step ) { 
    318318                $wpdb->show_errors( $errors );
    319319                if ( ! $wpdb->last_error ) {
    320320                        // MySQL was able to parse the prefix as a value, which we don't want. Bail.
    321                         wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) );
     321                        wp_die( __( '"Table Prefix" is invalid.' ) );
    322322                }
    323323
    324324                // Generate keys and salts using secure CSPRNG; fallback to API if enabled; further fallback to original wp_generate_password().
  • src/wp-admin/themes.php

    diff --git a/src/wp-admin/themes.php b/src/wp-admin/themes.php
    index 0f632d06cc..bb3912bd6a 100644
    a b if ( ! validate_current_theme() || isset( $_GET['broken'] ) ) { 
    280280$ct = wp_get_theme();
    281281
    282282if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
    283         echo '<div class="error"><p>' . __( 'Error:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
     283        echo '<div class="error"><p>' . $ct->errors()->get_error_message() . '</p></div>';
    284284}
    285285
    286286/*
  • src/wp-admin/users.php

    diff --git a/src/wp-admin/users.php b/src/wp-admin/users.php
    index 3742e95276..bea003c378 100644
    a b switch ( $wp_list_table->current_action() ) { 
    274274<h1><?php _e( 'Delete Users' ); ?></h1>
    275275                <?php if ( isset( $_REQUEST['error'] ) ) : ?>
    276276        <div class="error">
    277                 <p><strong><?php _e( 'Error:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
     277                <p><?php _e( 'Please select an option.' ); ?></p>
    278278        </div>
    279279                <?php endif; ?>
    280280
  • src/wp-includes/class-wp-theme.php

    diff --git a/src/wp-includes/class-wp-theme.php b/src/wp-includes/class-wp-theme.php
    index ca6359ec7e..2162546d57 100644
    a b final class WP_Theme implements ArrayAccess { 
    255255                                )
    256256                        );
    257257                        if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one.
    258                                 $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or doesn&#8217;t exist. Please check your installation.' ) );
     258                                $this->errors->add( 'theme_root_missing', __( 'The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
    259259                        }
    260260                        return;
    261261                } elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
  • src/wp-includes/comment.php

    diff --git a/src/wp-includes/comment.php b/src/wp-includes/comment.php
    index a001eabad7..d101563f85 100644
    a b function wp_check_comment_data_max_lengths( $comment_data ) { 
    12391239        $max_lengths = wp_get_comment_fields_max_lengths();
    12401240
    12411241        if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
    1242                 return new WP_Error( 'comment_author_column_length', __( '<strong>Error</strong>: Your name is too long.' ), 200 );
     1242                return new WP_Error( 'comment_author_column_length', __( 'Your name is too long.' ), 200 );
    12431243        }
    12441244
    12451245        if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
    1246                 return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error</strong>: Your email address is too long.' ), 200 );
     1246                return new WP_Error( 'comment_author_email_column_length', __( 'Your email address is too long.' ), 200 );
    12471247        }
    12481248
    12491249        if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
    1250                 return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error</strong>: Your URL is too long.' ), 200 );
     1250                return new WP_Error( 'comment_author_url_column_length', __( 'Your URL is too long.' ), 200 );
    12511251        }
    12521252
    12531253        if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
    1254                 return new WP_Error( 'comment_content_column_length', __( '<strong>Error</strong>: Your comment is too long.' ), 200 );
     1254                return new WP_Error( 'comment_content_column_length', __( 'Your comment is too long.' ), 200 );
    12551255        }
    12561256
    12571257        return true;
    function wp_handle_comment_submission( $comment_data ) { 
    33823382
    33833383        if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
    33843384                if ( '' == $comment_author_email || '' == $comment_author ) {
    3385                         return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields (name, email).' ), 200 );
     3385                        return new WP_Error( 'require_name_email', __( 'Please fill the required fields (name, email).' ), 200 );
    33863386                } elseif ( ! is_email( $comment_author_email ) ) {
    3387                         return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 );
     3387                        return new WP_Error( 'require_valid_email', __( 'Please enter a valid email address.' ), 200 );
    33883388                }
    33893389        }
    33903390
    function wp_handle_comment_submission( $comment_data ) { 
    34093409         */
    34103410        $allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata );
    34113411        if ( '' === $comment_content && ! $allow_empty_comment ) {
    3412                 return new WP_Error( 'require_valid_comment', __( '<strong>Error</strong>: Please type a comment.' ), 200 );
     3412                return new WP_Error( 'require_valid_comment', __( 'Please type a comment.' ), 200 );
    34133413        }
    34143414
    34153415        $check_max_lengths = wp_check_comment_data_max_lengths( $commentdata );
    function wp_handle_comment_submission( $comment_data ) { 
    34233423        }
    34243424
    34253425        if ( ! $comment_id ) {
    3426                 return new WP_Error( 'comment_save_error', __( '<strong>Error</strong>: The comment could not be saved. Please try again later.' ), 500 );
     3426                return new WP_Error( 'comment_save_error', __( 'The comment could not be saved. Please try again later.' ), 500 );
    34273427        }
    34283428
    34293429        return get_comment( $comment_id );
  • src/wp-includes/functions.php

    diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
    index 35c1e2e2f3..dfa4ae3a50 100644
    a b function do_feed() { 
    15451545        }
    15461546
    15471547        if ( ! has_action( "do_feed_{$feed}" ) ) {
    1548                 wp_die( __( 'Error: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
     1548                wp_die( __( 'This is not a valid feed template.' ), '', array( 'response' => 404 ) );
    15491549        }
    15501550
    15511551        /**
  • src/wp-includes/load.php

    diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php
    index b12a9c458f..3381f5eb3b 100644
    a b function wp_set_wpdb_vars() { 
    548548                wp_die(
    549549                        sprintf(
    550550                                /* translators: 1: $table_prefix, 2: wp-config.php */
    551                                 __( '<strong>Error</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
     551                                __( '%1$s in %2$s can only contain numbers, letters, and underscores.' ),
    552552                                '<code>$table_prefix</code>',
    553553                                '<code>wp-config.php</code>'
    554554                        )
  • src/wp-includes/ms-deprecated.php

    diff --git a/src/wp-includes/ms-deprecated.php b/src/wp-includes/ms-deprecated.php
    index 85399342c2..85d21bdb94 100644
    a b function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { 
    401401
    402402        // Check if the domain has been used already. We should return an error message.
    403403        if ( domain_exists($domain, $path, $site_id) )
    404                 return __( '<strong>Error</strong>: Site URL already taken.' );
     404                return __( 'Site URL already taken.' );
    405405
    406406        /*
    407407         * Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
    function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { 
    410410         */
    411411
    412412        if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
    413                 return __( '<strong>Error</strong>: Problem creating site entry.' );
     413                return __( 'Problem creating site entry.' );
    414414
    415415        switch_to_blog($blog_id);
    416416        install_blog($blog_id);
  • src/wp-includes/pluggable.php

    diff --git a/src/wp-includes/pluggable.php b/src/wp-includes/pluggable.php
    index c2579659df..3b99d5e6b2 100644
    a b if ( ! function_exists( 'wp_authenticate' ) ) : 
    546546                if ( null == $user ) {
    547547                        // TODO: What should the error message be? (Or would these even happen?)
    548548                        // Only needed if all authentication handlers fail to return anything.
    549                         $user = new WP_Error( 'authentication_failed', __( '<strong>Error</strong>: Invalid username, email address or incorrect password.' ) );
     549                        $user = new WP_Error( 'authentication_failed', __( 'Invalid username, email address or incorrect password.' ) );
    550550                }
    551551
    552552                $ignore_codes = array( 'empty_username', 'empty_password' );
  • src/wp-includes/theme.php

    diff --git a/src/wp-includes/theme.php b/src/wp-includes/theme.php
    index 48ccd29013..46317ff4b4 100644
    a b function validate_theme_requirements( $stylesheet ) { 
    930930                        'theme_wp_php_incompatible',
    931931                        sprintf(
    932932                                /* translators: %s: Theme name. */
    933                                 _x( '<strong>Error:</strong> Current WordPress and PHP versions do not meet minimum requirements for %s.', 'theme' ),
     933                                _x( 'Current WordPress and PHP versions do not meet minimum requirements for %s.', 'theme' ),
    934934                                $theme->display( 'Name' )
    935935                        )
    936936                );
    function validate_theme_requirements( $stylesheet ) { 
    939939                        'theme_php_incompatible',
    940940                        sprintf(
    941941                                /* translators: %s: Theme name. */
    942                                 _x( '<strong>Error:</strong> Current PHP version does not meet minimum requirements for %s.', 'theme' ),
     942                                _x( 'Current PHP version does not meet minimum requirements for %s.', 'theme' ),
    943943                                $theme->display( 'Name' )
    944944                        )
    945945                );
    function validate_theme_requirements( $stylesheet ) { 
    948948                        'theme_wp_incompatible',
    949949                        sprintf(
    950950                                /* translators: %s: Theme name. */
    951                                 _x( '<strong>Error:</strong> Current WordPress version does not meet minimum requirements for %s.', 'theme' ),
     951                                _x( 'Current WordPress version does not meet minimum requirements for %s.', 'theme' ),
    952952                                $theme->display( 'Name' )
    953953                        )
    954954                );
  • src/wp-includes/user.php

    diff --git a/src/wp-includes/user.php b/src/wp-includes/user.php
    index a1e88f2e5a..55414726d7 100644
    a b function wp_authenticate_username_password( $user, $username, $password ) { 
    134134                $error = new WP_Error();
    135135
    136136                if ( empty( $username ) ) {
    137                         $error->add( 'empty_username', __( '<strong>Error</strong>: The username field is empty.' ) );
     137                        $error->add( 'empty_username', __( 'The username field is empty.' ) );
    138138                }
    139139
    140140                if ( empty( $password ) ) {
    141                         $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
     141                        $error->add( 'empty_password', __( 'The password field is empty.' ) );
    142142                }
    143143
    144144                return $error;
    function wp_authenticate_username_password( $user, $username, $password ) { 
    172172                        'incorrect_password',
    173173                        sprintf(
    174174                                /* translators: %s: User name. */
    175                                 __( '<strong>Error</strong>: The password you entered for the username %s is incorrect.' ),
     175                                __( 'The password you entered for the username %s is incorrect.' ),
    176176                                '<strong>' . $username . '</strong>'
    177177                        ) .
    178178                        ' <a href="' . wp_lostpassword_url() . '">' .
    function wp_authenticate_email_password( $user, $email, $password ) { 
    209209
    210210                if ( empty( $email ) ) {
    211211                        // Uses 'empty_username' for back-compat with wp_signon().
    212                         $error->add( 'empty_username', __( '<strong>Error</strong>: The email field is empty.' ) );
     212                        $error->add( 'empty_username', __( 'The email field is empty.' ) );
    213213                }
    214214
    215215                if ( empty( $password ) ) {
    216                         $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) );
     216                        $error->add( 'empty_password', __( 'The password field is empty.' ) );
    217217                }
    218218
    219219                return $error;
    function wp_authenticate_email_password( $user, $email, $password ) { 
    244244                        'incorrect_password',
    245245                        sprintf(
    246246                                /* translators: %s: Email address. */
    247                                 __( '<strong>Error</strong>: The password you entered for the email address %s is incorrect.' ),
     247                                __( 'The password you entered for the email address %s is incorrect.' ),
    248248                                '<strong>' . $email . '</strong>'
    249249                        ) .
    250250                        ' <a href="' . wp_lostpassword_url() . '">' .
    function wp_authenticate_spam_check( $user ) { 
    319319                $spammed = apply_filters( 'check_is_user_spammed', is_user_spammy( $user ), $user );
    320320
    321321                if ( $spammed ) {
    322                         return new WP_Error( 'spammer_account', __( '<strong>Error</strong>: Your account has been marked as a spammer.' ) );
     322                        return new WP_Error( 'spammer_account', __( 'Your account has been marked as a spammer.' ) );
    323323                }
    324324        }
    325325        return $user;
    function get_password_reset_key( $user ) { 
    22782278        global $wp_hasher;
    22792279
    22802280        if ( ! ( $user instanceof WP_User ) ) {
    2281                 return new WP_Error( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
     2281                return new WP_Error( 'invalidcombo', __( 'There is no account with that username or email address.' ) );
    22822282        }
    22832283
    22842284        /**
    function register_new_user( $user_login, $user_email ) { 
    25072507
    25082508        // Check the username.
    25092509        if ( '' === $sanitized_user_login ) {
    2510                 $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) );
     2510                $errors->add( 'empty_username', __( 'Please enter a username.' ) );
    25112511        } elseif ( ! validate_username( $user_login ) ) {
    2512                 $errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
     2512                $errors->add( 'invalid_username', __( 'This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
    25132513                $sanitized_user_login = '';
    25142514        } elseif ( username_exists( $sanitized_user_login ) ) {
    2515                 $errors->add( 'username_exists', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
     2515                $errors->add( 'username_exists', __( 'This username is already registered. Please choose another one.' ) );
    25162516
    25172517        } else {
    25182518                /** This filter is documented in wp-includes/user.php */
    25192519                $illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );
    25202520                if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) {
    2521                         $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
     2521                        $errors->add( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
    25222522                }
    25232523        }
    25242524
    25252525        // Check the email address.
    25262526        if ( '' === $user_email ) {
    2527                 $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) );
     2527                $errors->add( 'empty_email', __( 'Please type your email address.' ) );
    25282528        } elseif ( ! is_email( $user_email ) ) {
    2529                 $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ) );
     2529                $errors->add( 'invalid_email', __( 'The email address isn&#8217;t correct.' ) );
    25302530                $user_email = '';
    25312531        } elseif ( email_exists( $user_email ) ) {
    2532                 $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ) );
     2532                $errors->add( 'email_exists', __( 'This email is already registered. Please choose another one.' ) );
    25332533        }
    25342534
    25352535        /**
    function register_new_user( $user_login, $user_email ) { 
    25742574                        'registerfail',
    25752575                        sprintf(
    25762576                                /* translators: %s: Admin email address. */
    2577                                 __( '<strong>Error</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ),
     2577                                __( 'Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a>!' ),
    25782578                                get_option( 'admin_email' )
    25792579                        )
    25802580                );
    function send_confirmation_on_profile_email() { 
    28092809                if ( ! is_email( $_POST['email'] ) ) {
    28102810                        $errors->add(
    28112811                                'user_email',
    2812                                 __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ),
     2812                                __( 'The email address isn’t correct.' ),
    28132813                                array(
    28142814                                        'form-field' => 'email',
    28152815                                )
    function send_confirmation_on_profile_email() { 
    28212821                if ( email_exists( $_POST['email'] ) ) {
    28222822                        $errors->add(
    28232823                                'user_email',
    2824                                 __( '<strong>Error</strong>: The email address is already used.' ),
     2824                                __( 'The email address is already used.' ),
    28252825                                array(
    28262826                                        'form-field' => 'email',
    28272827                                )
  • src/wp-includes/wp-db.php

    diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php
    index 76e93ad81d..54c7c0b4e6 100644
    a b class wpdb { 
    35303530                // Make sure the server has the required MySQL version.
    35313531                if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) {
    35323532                        /* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */
    3533                         return new WP_Error( 'database_version', sprintf( __( '<strong>Error</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
     3533                        return new WP_Error( 'database_version', sprintf( __( 'WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
    35343534                }
    35353535        }
    35363536
  • src/wp-login.php

    diff --git a/src/wp-login.php b/src/wp-login.php
    index f289c35d4b..51cd7de3ac 100644
    a b function retrieve_password() { 
    358358        $user_data = false;
    359359
    360360        if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) {
    361                 $errors->add( 'empty_username', __( '<strong>Error</strong>: Enter a username or email address.' ) );
     361                $errors->add( 'empty_username', __( 'Please enter a username or email address.' ) );
    362362        } elseif ( strpos( $_POST['user_login'], '@' ) ) {
    363363                $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
    364364                if ( empty( $user_data ) ) {
    365                         $errors->add( 'invalid_email', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
     365                        $errors->add( 'invalid_email', __( 'There is no account with that username or email address.' ) );
    366366                }
    367367        } else {
    368368                $login     = trim( wp_unslash( $_POST['user_login'] ) );
    function retrieve_password() { 
    387387        }
    388388
    389389        if ( ! $user_data ) {
    390                 $errors->add( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
     390                $errors->add( 'invalidcombo', __( 'There is no account with that username or email address.' ) );
    391391                return $errors;
    392392        }
    393393
    function retrieve_password() { 
    454454                        'retrieve_password_email_failure',
    455455                        sprintf(
    456456                                /* translators: %s: Documentation URL. */
    457                                 __( '<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>.' ),
     457                                __( '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>.' ),
    458458                                esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
    459459                        )
    460460                );
    switch ( $action ) { 
    11971197                                        'test_cookie',
    11981198                                        sprintf(
    11991199                                                /* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */
    1200                                                 __( '<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>.' ),
     1200                                                __( '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>.' ),
    12011201                                                __( 'https://wordpress.org/support/article/cookies/' ),
    12021202                                                __( 'https://wordpress.org/support/forums/' )
    12031203                                        )
    switch ( $action ) { 
    12081208                                        'test_cookie',
    12091209                                        sprintf(
    12101210                                                /* translators: %s: Browser cookie documentation URL. */
    1211                                                 __( '<strong>Error</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
     1211                                                __( 'Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
    12121212                                                __( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' )
    12131213                                        )
    12141214                                );
  • tests/phpunit/includes/bootstrap.php

    diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
    index d628d62c09..460454b1b7 100644
    a b if ( defined( 'WP_TESTS_CONFIG_FILE_PATH' ) ) { 
    3030global $wpdb, $current_site, $current_blog, $wp_rewrite, $shortcode_tags, $wp, $phpmailer, $wp_theme_directories;
    3131
    3232if ( ! is_readable( $config_file_path ) ) {
    33         echo "Error: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n";
     33        echo "wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n";
    3434        exit( 1 );
    3535}
    3636
    require_once __DIR__ . '/functions.php'; 
    3939
    4040if ( version_compare( tests_get_phpunit_version(), '5.4', '<' ) || version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) {
    4141        printf(
    42                 "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",
     42                "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",
    4343                tests_get_phpunit_version()
    4444        );
    4545        echo "Please use the latest PHPUnit version from the 7.x branch.\n";
    if ( version_compare( tests_get_phpunit_version(), '5.4', '<' ) || version_compa 
    4747}
    4848
    4949if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) {
    50         echo "Error: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
     50        echo "The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
    5151        exit( 1 );
    5252}
    5353
  • tests/phpunit/includes/trac.php

    diff --git a/tests/phpunit/includes/trac.php b/tests/phpunit/includes/trac.php
    index 84617fa661..c901362bb9 100644
    a b class TracTickets { 
    5454        // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.MethodNameInvalid
    5555        public static function forcingKnownBugs() {
    5656                echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K";
    57                 echo "Error: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
     57                echo "Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
    5858                echo "\x1b[0m\x1b[2K";
    5959        }
    6060}
  • tests/phpunit/tests/ajax/ReplytoComment.php

    diff --git a/tests/phpunit/tests/ajax/ReplytoComment.php b/tests/phpunit/tests/ajax/ReplytoComment.php
    index d0cabef41e..d17ede023c 100644
    a b class Tests_Ajax_ReplytoComment extends WP_Ajax_UnitTestCase { 
    187187                $_POST['comment_post_ID']             = self::$draft_post->ID;
    188188
    189189                // Make the request.
    190                 $this->setExpectedException( 'WPAjaxDieStopException', 'Error: You are replying to a comment on a draft post.' );
     190                $this->setExpectedException( 'WPAjaxDieStopException', 'You are replying to a comment on a draft post.' );
    191191                $this->_handleAjax( 'replyto-comment' );
    192192        }
    193193