WordPress.org

Make WordPress Core

Changeset 47156


Ignore:
Timestamp:
02/01/2020 09:36:44 PM (22 months ago)
Author:
SergeyBiryukov
Message:

Accessibility: Text Changes: Use sentence case for the word Error in various error messages, instead of all caps.

Using all caps should be avoided for better readability and because screen readers may pronounce all-caps words as abbreviations.

Props afercia, ryokuhi, sabernhardt, garrett-eclipse.
See #47656, #43037, #42945.

Location:
trunk
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js

    r43309 r47156  
    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: "Error: 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}",
  • trunk/src/wp-admin/import.php

    r47122 r47156  
    6262<?php if ( ! empty( $_GET['invalid'] ) ) : ?>
    6363    <div class="error">
    64         <p><strong><?php _e( 'ERROR:' ); ?></strong>
     64        <p><strong><?php _e( 'Error:' ); ?></strong>
    6565            <?php
    6666            /* translators: %s: Importer slug. */
  • trunk/src/wp-admin/includes/ajax-actions.php

    r47154 r47156  
    12731273        wp_die( 1 );
    12741274    } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ) ) ) {
    1275         wp_die( __( 'ERROR: You are replying to a comment on a draft post.' ) );
     1275        wp_die( __( 'Error: You are replying to a comment on a draft post.' ) );
    12761276    }
    12771277
     
    13031303
    13041304    if ( '' == $comment_content ) {
    1305         wp_die( __( 'ERROR: Please type a comment.' ) );
     1305        wp_die( __( 'Error: Please type a comment.' ) );
    13061306    }
    13071307
     
    14051405
    14061406    if ( '' == $_POST['content'] ) {
    1407         wp_die( __( 'ERROR: Please type a comment.' ) );
     1407        wp_die( __( 'Error: Please type a comment.' ) );
    14081408    }
    14091409
  • trunk/src/wp-admin/includes/file.php

    r47122 r47156  
    20752075
    20762076    if ( $error ) {
    2077         $error_string = __( '<strong>ERROR:</strong> There was an error connecting to the server, Please verify the settings are correct.' );
     2077        $error_string = __( '<strong>Error</strong>: There was an error connecting to the server, Please verify the settings are correct.' );
    20782078        if ( is_wp_error( $error ) ) {
    20792079            $error_string = esc_html( $error->get_error_message() );
  • trunk/src/wp-admin/includes/network.php

    r47119 r47156  
    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><strong>' . __( 'Error:' ) . '</strong> ' . sprintf(
    114114            /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */
    115115            __( 'The constant %s cannot be defined when creating a network.' ),
     
    137137    $has_ports = strstr( $hostname, ':' );
    138138    if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
    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>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
    140140        echo '<p>' . sprintf(
    141141            /* translators: %s: Port number. */
     
    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>' . __( 'Error: The network could not be created.' ) . '</strong></p>';
    158158        foreach ( $errors->get_error_messages() as $error ) {
    159159            echo "<p>$error</p>";
  • trunk/src/wp-admin/includes/user.php

    r47122 r47156  
    145145    /* checking that username has been typed */
    146146    if ( $user->user_login == '' ) {
    147         $errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
     147        $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
    148148    }
    149149
    150150    /* checking that nickname has been typed */
    151151    if ( $update && empty( $user->nickname ) ) {
    152         $errors->add( 'nickname', __( '<strong>ERROR</strong>: Please enter a nickname.' ) );
     152        $errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) );
    153153    }
    154154
     
    166166    // Check for blank password when adding a user.
    167167    if ( ! $update && empty( $pass1 ) ) {
    168         $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
     168        $errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
    169169    }
    170170
    171171    // Check for "\" in password.
    172172    if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
    173         $errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
     173        $errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
    174174    }
    175175
    176176    // Checking the password has been typed twice the same.
    177177    if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
    178         $errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
     178        $errors->add( 'pass', __( '<strong>Error</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
    179179    }
    180180
     
    184184
    185185    if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) {
    186         $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
     186        $errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
    187187    }
    188188
    189189    if ( ! $update && username_exists( $user->user_login ) ) {
    190         $errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
     190        $errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
    191191    }
    192192
     
    195195
    196196    if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) {
    197         $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
     197        $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
    198198    }
    199199
    200200    /* checking email address */
    201201    if ( empty( $user->user_email ) ) {
    202         $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
     202        $errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
    203203    } elseif ( ! is_email( $user->user_email ) ) {
    204         $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
     204        $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
    205205    } else {
    206206        $owner_id = email_exists( $user->user_email );
    207207        if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
    208             $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
     208            $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
    209209        }
    210210    }
  • trunk/src/wp-admin/options.php

    r47154 r47156  
    218218
    219219    if ( ! isset( $whitelist_options[ $option_page ] ) ) {
    220         wp_die( __( '<strong>ERROR</strong>: Options page not found.' ) );
     220        wp_die( __( '<strong>Error</strong>: Options page not found.' ) );
    221221    }
    222222
  • trunk/src/wp-admin/setup-config.php

    r47122 r47156  
    279279
    280280        if ( empty( $prefix ) ) {
    281             wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
     281            wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );
    282282        }
    283283
    284284        // Validate $prefix: it can only contain letters, numbers and underscores.
    285285        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
    286             wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
     286            wp_die( __( '<strong>Error</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );
    287287        }
    288288
     
    317317        if ( ! $wpdb->last_error ) {
    318318            // MySQL was able to parse the prefix as a value, which we don't want. Bail.
    319             wp_die( __( '<strong>ERROR</strong>: "Table Prefix" is invalid.' ) );
     319            wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) );
    320320        }
    321321
  • trunk/src/wp-admin/themes.php

    r47122 r47156  
    234234
    235235if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) {
    236     echo '<div class="error"><p>' . __( 'ERROR:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
     236    echo '<div class="error"><p>' . __( 'Error:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';
    237237}
    238238
  • trunk/src/wp-admin/users.php

    r47122 r47156  
    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><strong><?php _e( 'Error:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
    278278    </div>
    279279        <?php endif; ?>
  • trunk/src/wp-includes/class-wp-theme.php

    r47145 r47156  
    254254            );
    255255            if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one.
    256                 $this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn&#8217;t exist. Please check your installation.' ) );
     256                $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or doesn&#8217;t exist. Please check your installation.' ) );
    257257            }
    258258            return;
  • trunk/src/wp-includes/comment.php

    r47154 r47156  
    12251225
    12261226    if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
    1227         return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: Your name is too long.' ), 200 );
     1227        return new WP_Error( 'comment_author_column_length', __( '<strong>Error</strong>: Your name is too long.' ), 200 );
    12281228    }
    12291229
    12301230    if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
    1231         return new WP_Error( 'comment_author_email_column_length', __( '<strong>ERROR</strong>: Your email address is too long.' ), 200 );
     1231        return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error</strong>: Your email address is too long.' ), 200 );
    12321232    }
    12331233
    12341234    if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
    1235         return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: Your url is too long.' ), 200 );
     1235        return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error</strong>: Your URL is too long.' ), 200 );
    12361236    }
    12371237
    12381238    if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
    1239         return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: Your comment is too long.' ), 200 );
     1239        return new WP_Error( 'comment_content_column_length', __( '<strong>Error</strong>: Your comment is too long.' ), 200 );
    12401240    }
    12411241
     
    33533353    if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
    33543354        if ( '' == $comment_author_email || '' == $comment_author ) {
    3355             return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: Please fill the required fields (name, email).' ), 200 );
     3355            return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields (name, email).' ), 200 );
    33563356        } elseif ( ! is_email( $comment_author_email ) ) {
    3357             return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: Please enter a valid email address.' ), 200 );
     3357            return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 );
    33583358        }
    33593359    }
     
    33803380    $allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata );
    33813381    if ( '' === $comment_content && ! $allow_empty_comment ) {
    3382         return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: Please type a comment.' ), 200 );
     3382        return new WP_Error( 'require_valid_comment', __( '<strong>Error</strong>: Please type a comment.' ), 200 );
    33833383    }
    33843384
     
    33943394
    33953395    if ( ! $comment_id ) {
    3396         return new WP_Error( 'comment_save_error', __( '<strong>ERROR</strong>: The comment could not be saved. Please try again later.' ), 500 );
     3396        return new WP_Error( 'comment_save_error', __( '<strong>Error</strong>: The comment could not be saved. Please try again later.' ), 500 );
    33973397    }
    33983398
  • trunk/src/wp-includes/functions.php

    r47122 r47156  
    15441544
    15451545    if ( ! has_action( "do_feed_{$feed}" ) ) {
    1546         wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
     1546        wp_die( __( 'Error: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
    15471547    }
    15481548
  • trunk/src/wp-includes/load.php

    r47122 r47156  
    490490            sprintf(
    491491                /* translators: 1: $table_prefix, 2: wp-config.php */
    492                 __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
     492                __( '<strong>Error</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
    493493                '<code>$table_prefix</code>',
    494494                '<code>wp-config.php</code>'
  • trunk/src/wp-includes/ms-deprecated.php

    r47154 r47156  
    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 __( '<strong>Error</strong>: Site URL already taken.' );
    405405
    406406    /*
     
    411411
    412412    if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
    413         return __( '<strong>ERROR</strong>: Problem creating site entry.' );
     413        return __( '<strong>Error</strong>: Problem creating site entry.' );
    414414
    415415    switch_to_blog($blog_id);
  • trunk/src/wp-includes/pluggable.php

    r47122 r47156  
    542542            // TODO: What should the error message be? (Or would these even happen?)
    543543            // Only needed if all authentication handlers fail to return anything.
    544             $user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );
     544            $user = new WP_Error( 'authentication_failed', __( '<strong>Error</strong>: Invalid username, email address or incorrect password.' ) );
    545545        }
    546546
  • trunk/src/wp-includes/user.php

    r47122 r47156  
    135135
    136136        if ( empty( $username ) ) {
    137             $error->add( 'empty_username', __( '<strong>ERROR</strong>: The username field is empty.' ) );
     137            $error->add( 'empty_username', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: The password field is empty.' ) );
    142142        }
    143143
     
    173173            sprintf(
    174174                /* translators: %s: User name. */
    175                 __( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ),
     175                __( '<strong>Error</strong>: The password you entered for the username %s is incorrect.' ),
    176176                '<strong>' . $username . '</strong>'
    177177            ) .
     
    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', __( '<strong>Error</strong>: 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', __( '<strong>Error</strong>: The password field is empty.' ) );
    217217        }
    218218
     
    245245            sprintf(
    246246                /* translators: %s: Email address. */
    247                 __( '<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.' ),
     247                __( '<strong>Error</strong>: The password you entered for the email address %s is incorrect.' ),
    248248                '<strong>' . $email . '</strong>'
    249249            ) .
     
    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', __( '<strong>Error</strong>: Your account has been marked as a spammer.' ) );
    323323        }
    324324    }
     
    22662266
    22672267    if ( ! ( $user instanceof WP_User ) ) {
    2268         return new WP_Error( 'invalidcombo', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
     2268        return new WP_Error( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
    22692269    }
    22702270
     
    24952495    // Check the username.
    24962496    if ( $sanitized_user_login == '' ) {
    2497         $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
     2497        $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) );
    24982498    } elseif ( ! validate_username( $user_login ) ) {
    2499         $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
     2499        $errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
    25002500        $sanitized_user_login = '';
    25012501    } elseif ( username_exists( $sanitized_user_login ) ) {
    2502         $errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
     2502        $errors->add( 'username_exists', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) );
    25032503
    25042504    } else {
     
    25062506        $illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() );
    25072507        if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) {
    2508             $errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
     2508            $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) );
    25092509        }
    25102510    }
     
    25122512    // Check the email address.
    25132513    if ( $user_email == '' ) {
    2514         $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );
     2514        $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) );
    25152515    } elseif ( ! is_email( $user_email ) ) {
    2516         $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
     2516        $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ) );
    25172517        $user_email = '';
    25182518    } elseif ( email_exists( $user_email ) ) {
    2519         $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
     2519        $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered, please choose another one.' ) );
    25202520    }
    25212521
     
    25622562            sprintf(
    25632563                /* translators: %s: Admin email address. */
    2564                 __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ),
     2564                __( '<strong>Error</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ),
    25652565                get_option( 'admin_email' )
    25662566            )
     
    27972797            $errors->add(
    27982798                'user_email',
    2799                 __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ),
     2799                __( '<strong>Error</strong>: The email address isn&#8217;t correct.' ),
    28002800                array(
    28012801                    'form-field' => 'email',
     
    28092809            $errors->add(
    28102810                'user_email',
    2811                 __( '<strong>ERROR</strong>: The email address is already used.' ),
     2811                __( '<strong>Error</strong>: The email address is already used.' ),
    28122812                array(
    28132813                    'form-field' => 'email',
  • trunk/src/wp-includes/wp-db.php

    r47122 r47156  
    34993499        if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) {
    35003500            /* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */
    3501             return new WP_Error( 'database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
     3501            return new WP_Error( 'database_version', sprintf( __( '<strong>Error</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );
    35023502        }
    35033503    }
  • trunk/src/wp-login.php

    r47122 r47156  
    368368
    369369    if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) {
    370         $errors->add( 'empty_username', __( '<strong>ERROR</strong>: Enter a username or email address.' ) );
     370        $errors->add( 'empty_username', __( '<strong>Error</strong>: Enter a username or email address.' ) );
    371371    } elseif ( strpos( $_POST['user_login'], '@' ) ) {
    372372        $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) );
    373373        if ( empty( $user_data ) ) {
    374             $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
     374            $errors->add( 'invalid_email', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
    375375        }
    376376    } else {
     
    397397
    398398    if ( ! $user_data ) {
    399         $errors->add( 'invalidcombo', __( '<strong>ERROR</strong>: There is no account with that username or email address.' ) );
     399        $errors->add( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) );
    400400        return $errors;
    401401    }
     
    464464            sprintf(
    465465                /* translators: %s: Documentation URL. */
    466                 __( '<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>.' ),
     466                __( '<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>.' ),
    467467                esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) )
    468468            )
     
    12071207                    sprintf(
    12081208                        /* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */
    1209                         __( '<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>.' ),
     1209                        __( '<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>.' ),
    12101210                        __( 'https://wordpress.org/support/article/cookies/' ),
    12111211                        __( 'https://wordpress.org/support/forums/' )
     
    12181218                    sprintf(
    12191219                        /* translators: %s: Browser cookie documentation URL. */
    1220                         __( '<strong>ERROR</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
     1220                        __( '<strong>Error</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),
    12211221                        __( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' )
    12221222                    )
  • trunk/tests/phpunit/includes/bootstrap.php

    r47122 r47156  
    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 "Error: wp-tests-config.php is missing! Please use wp-tests-config-sample.php to create a config file.\n";
    3434    exit( 1 );
    3535}
     
    4040if ( version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) {
    4141    printf(
    42         "ERROR: Looks like you're using PHPUnit %s. WordPress is currently only compatible with PHPUnit up to 7.x.\n",
     42        "Error: Looks like you're using PHPUnit %s. WordPress is currently only compatible with PHPUnit up to 7.x.\n",
    4343        tests_get_phpunit_version()
    4444    );
     
    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 "Error: The /build/ directory is missing! Please run `npm run build` prior to running PHPUnit.\n";
    5151    exit( 1 );
    5252}
  • trunk/tests/phpunit/includes/trac.php

    r47122 r47156  
    4848    public static function usingLocalCache() {
    4949        echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K";
    50         echo 'INFO: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL;
     50        echo 'Info: Trac was inaccessible, so a local ticket status cache was used.' . PHP_EOL;
    5151        echo "\x1b[0m\x1b[2K";
    5252    }
     
    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 "Error: Trac was inaccessible, so known bugs weren't able to be skipped." . PHP_EOL;
    5858        echo "\x1b[0m\x1b[2K";
    5959    }
  • trunk/tests/phpunit/tests/ajax/ReplytoComment.php

    r47155 r47156  
    188188
    189189        // Make the request.
    190         $this->setExpectedException( 'WPAjaxDieStopException', 'ERROR: You are replying to a comment on a draft post.' );
     190        $this->setExpectedException( 'WPAjaxDieStopException', 'Error: You are replying to a comment on a draft post.' );
    191191        $this->_handleAjax( 'replyto-comment' );
    192192    }
Note: See TracChangeset for help on using the changeset viewer.