![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 47156
- Timestamp:
- 02/01/2020 09:36:44 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 22 edited
-
src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js (modified) (1 diff)
-
src/wp-admin/import.php (modified) (1 diff)
-
src/wp-admin/includes/ajax-actions.php (modified) (3 diffs)
-
src/wp-admin/includes/file.php (modified) (1 diff)
-
src/wp-admin/includes/network.php (modified) (3 diffs)
-
src/wp-admin/includes/user.php (modified) (4 diffs)
-
src/wp-admin/options.php (modified) (1 diff)
-
src/wp-admin/setup-config.php (modified) (2 diffs)
-
src/wp-admin/themes.php (modified) (1 diff)
-
src/wp-admin/users.php (modified) (1 diff)
-
src/wp-includes/class-wp-theme.php (modified) (1 diff)
-
src/wp-includes/comment.php (modified) (4 diffs)
-
src/wp-includes/functions.php (modified) (1 diff)
-
src/wp-includes/load.php (modified) (1 diff)
-
src/wp-includes/ms-deprecated.php (modified) (2 diffs)
-
src/wp-includes/pluggable.php (modified) (1 diff)
-
src/wp-includes/user.php (modified) (12 diffs)
-
src/wp-includes/wp-db.php (modified) (1 diff)
-
src/wp-login.php (modified) (5 diffs)
-
tests/phpunit/includes/bootstrap.php (modified) (3 diffs)
-
tests/phpunit/includes/trac.php (modified) (2 diffs)
-
tests/phpunit/tests/ajax/ReplytoComment.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js
r43309 r47156 25 25 clipboard_no_support: "Currently not supported by your browser, use keyboard shortcuts instead.", 26 26 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: "E RROR: Invalid values entered, these are marked in red.",27 invalid_data: "Error: Invalid values entered, these are marked in red.", 28 28 invalid_data_number: "{#field} must be a number", 29 29 invalid_data_min: "{#field} must be a number greater than {#min}", -
trunk/src/wp-admin/import.php
r47122 r47156 62 62 <?php if ( ! empty( $_GET['invalid'] ) ) : ?> 63 63 <div class="error"> 64 <p><strong><?php _e( 'E RROR:' ); ?></strong>64 <p><strong><?php _e( 'Error:' ); ?></strong> 65 65 <?php 66 66 /* translators: %s: Importer slug. */ -
trunk/src/wp-admin/includes/ajax-actions.php
r47154 r47156 1273 1273 wp_die( 1 ); 1274 1274 } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ) ) ) { 1275 wp_die( __( 'E RROR: You are replying to a comment on a draft post.' ) );1275 wp_die( __( 'Error: You are replying to a comment on a draft post.' ) ); 1276 1276 } 1277 1277 … … 1303 1303 1304 1304 if ( '' == $comment_content ) { 1305 wp_die( __( 'E RROR: Please type a comment.' ) );1305 wp_die( __( 'Error: Please type a comment.' ) ); 1306 1306 } 1307 1307 … … 1405 1405 1406 1406 if ( '' == $_POST['content'] ) { 1407 wp_die( __( 'E RROR: Please type a comment.' ) );1407 wp_die( __( 'Error: Please type a comment.' ) ); 1408 1408 } 1409 1409 -
trunk/src/wp-admin/includes/file.php
r47122 r47156 2075 2075 2076 2076 if ( $error ) { 2077 $error_string = __( '<strong>E RROR:</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.' ); 2078 2078 if ( is_wp_error( $error ) ) { 2079 2079 $error_string = esc_html( $error->get_error_message() ); -
trunk/src/wp-admin/includes/network.php
r47119 r47156 111 111 112 112 if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { 113 echo '<div class="error"><p><strong>' . __( 'E RROR:' ) . '</strong> ' . sprintf(113 echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf( 114 114 /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */ 115 115 __( 'The constant %s cannot be defined when creating a network.' ), … … 137 137 $has_ports = strstr( $hostname, ':' ); 138 138 if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) { 139 echo '<div class="error"><p><strong>' . __( 'E RROR:' ) . '</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>'; 140 140 echo '<p>' . sprintf( 141 141 /* translators: %s: Port number. */ … … 155 155 $error_codes = array(); 156 156 if ( is_wp_error( $errors ) ) { 157 echo '<div class="error"><p><strong>' . __( 'E RROR: The network could not be created.' ) . '</strong></p>';157 echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>'; 158 158 foreach ( $errors->get_error_messages() as $error ) { 159 159 echo "<p>$error</p>"; -
trunk/src/wp-admin/includes/user.php
r47122 r47156 145 145 /* checking that username has been typed */ 146 146 if ( $user->user_login == '' ) { 147 $errors->add( 'user_login', __( '<strong>E RROR</strong>: Please enter a username.' ) );147 $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) ); 148 148 } 149 149 150 150 /* checking that nickname has been typed */ 151 151 if ( $update && empty( $user->nickname ) ) { 152 $errors->add( 'nickname', __( '<strong>E RROR</strong>: Please enter a nickname.' ) );152 $errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) ); 153 153 } 154 154 … … 166 166 // Check for blank password when adding a user. 167 167 if ( ! $update && empty( $pass1 ) ) { 168 $errors->add( 'pass', __( '<strong>E RROR</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );168 $errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) ); 169 169 } 170 170 171 171 // Check for "\" in password. 172 172 if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) { 173 $errors->add( 'pass', __( '<strong>E RROR</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' ) ); 174 174 } 175 175 176 176 // Checking the password has been typed twice the same. 177 177 if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) { 178 $errors->add( 'pass', __( '<strong>E RROR</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' ) ); 179 179 } 180 180 … … 184 184 185 185 if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) { 186 $errors->add( 'user_login', __( '<strong>E RROR</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.' ) ); 187 187 } 188 188 189 189 if ( ! $update && username_exists( $user->user_login ) ) { 190 $errors->add( 'user_login', __( '<strong>E RROR</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.' ) ); 191 191 } 192 192 … … 195 195 196 196 if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) { 197 $errors->add( 'invalid_username', __( '<strong>E RROR</strong>: Sorry, that username is not allowed.' ) );197 $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) ); 198 198 } 199 199 200 200 /* checking email address */ 201 201 if ( empty( $user->user_email ) ) { 202 $errors->add( 'empty_email', __( '<strong>E RROR</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' ) ); 203 203 } elseif ( ! is_email( $user->user_email ) ) { 204 $errors->add( 'invalid_email', __( '<strong>E RROR</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) );204 $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); 205 205 } else { 206 206 $owner_id = email_exists( $user->user_email ); 207 207 if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) { 208 $errors->add( 'email_exists', __( '<strong>E RROR</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' ) ); 209 209 } 210 210 } -
trunk/src/wp-admin/options.php
r47154 r47156 218 218 219 219 if ( ! isset( $whitelist_options[ $option_page ] ) ) { 220 wp_die( __( '<strong>E RROR</strong>: Options page not found.' ) );220 wp_die( __( '<strong>Error</strong>: Options page not found.' ) ); 221 221 } 222 222 -
trunk/src/wp-admin/setup-config.php
r47122 r47156 279 279 280 280 if ( empty( $prefix ) ) { 281 wp_die( __( '<strong>E RROR</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link );281 wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link ); 282 282 } 283 283 284 284 // Validate $prefix: it can only contain letters, numbers and underscores. 285 285 if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) { 286 wp_die( __( '<strong>E RROR</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 ); 287 287 } 288 288 … … 317 317 if ( ! $wpdb->last_error ) { 318 318 // MySQL was able to parse the prefix as a value, which we don't want. Bail. 319 wp_die( __( '<strong>E RROR</strong>: "Table Prefix" is invalid.' ) );319 wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) ); 320 320 } 321 321 -
trunk/src/wp-admin/themes.php
r47122 r47156 234 234 235 235 if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { 236 echo '<div class="error"><p>' . __( 'E RROR:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>';236 echo '<div class="error"><p>' . __( 'Error:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>'; 237 237 } 238 238 -
trunk/src/wp-admin/users.php
r47122 r47156 275 275 <?php if ( isset( $_REQUEST['error'] ) ) : ?> 276 276 <div class="error"> 277 <p><strong><?php _e( 'E RROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>277 <p><strong><?php _e( 'Error:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p> 278 278 </div> 279 279 <?php endif; ?> -
trunk/src/wp-includes/class-wp-theme.php
r47145 r47156 254 254 ); 255 255 if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one. 256 $this->errors->add( 'theme_root_missing', __( 'E RROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );256 $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or doesn’t exist. Please check your installation.' ) ); 257 257 } 258 258 return; -
trunk/src/wp-includes/comment.php
r47154 r47156 1225 1225 1226 1226 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>E RROR</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 ); 1228 1228 } 1229 1229 1230 1230 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>E RROR</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 ); 1232 1232 } 1233 1233 1234 1234 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>E RROR</strong>: Your urlis too long.' ), 200 );1235 return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error</strong>: Your URL is too long.' ), 200 ); 1236 1236 } 1237 1237 1238 1238 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>E RROR</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 ); 1240 1240 } 1241 1241 … … 3353 3353 if ( get_option( 'require_name_email' ) && ! $user->exists() ) { 3354 3354 if ( '' == $comment_author_email || '' == $comment_author ) { 3355 return new WP_Error( 'require_name_email', __( '<strong>E RROR</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 ); 3356 3356 } elseif ( ! is_email( $comment_author_email ) ) { 3357 return new WP_Error( 'require_valid_email', __( '<strong>E RROR</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 ); 3358 3358 } 3359 3359 } … … 3380 3380 $allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata ); 3381 3381 if ( '' === $comment_content && ! $allow_empty_comment ) { 3382 return new WP_Error( 'require_valid_comment', __( '<strong>E RROR</strong>: Please type a comment.' ), 200 );3382 return new WP_Error( 'require_valid_comment', __( '<strong>Error</strong>: Please type a comment.' ), 200 ); 3383 3383 } 3384 3384 … … 3394 3394 3395 3395 if ( ! $comment_id ) { 3396 return new WP_Error( 'comment_save_error', __( '<strong>E RROR</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 ); 3397 3397 } 3398 3398 -
trunk/src/wp-includes/functions.php
r47122 r47156 1544 1544 1545 1545 if ( ! has_action( "do_feed_{$feed}" ) ) { 1546 wp_die( __( 'E RROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );1546 wp_die( __( 'Error: This is not a valid feed template.' ), '', array( 'response' => 404 ) ); 1547 1547 } 1548 1548 -
trunk/src/wp-includes/load.php
r47122 r47156 490 490 sprintf( 491 491 /* translators: 1: $table_prefix, 2: wp-config.php */ 492 __( '<strong>E RROR</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.' ), 493 493 '<code>$table_prefix</code>', 494 494 '<code>wp-config.php</code>' -
trunk/src/wp-includes/ms-deprecated.php
r47154 r47156 402 402 // Check if the domain has been used already. We should return an error message. 403 403 if ( domain_exists($domain, $path, $site_id) ) 404 return __( '<strong>E RROR</strong>: Site URL already taken.' );404 return __( '<strong>Error</strong>: Site URL already taken.' ); 405 405 406 406 /* … … 411 411 412 412 if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) 413 return __( '<strong>E RROR</strong>: Problem creating site entry.' );413 return __( '<strong>Error</strong>: Problem creating site entry.' ); 414 414 415 415 switch_to_blog($blog_id); -
trunk/src/wp-includes/pluggable.php
r47122 r47156 542 542 // TODO: What should the error message be? (Or would these even happen?) 543 543 // Only needed if all authentication handlers fail to return anything. 544 $user = new WP_Error( 'authentication_failed', __( '<strong>E RROR</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.' ) ); 545 545 } 546 546 -
trunk/src/wp-includes/user.php
r47122 r47156 135 135 136 136 if ( empty( $username ) ) { 137 $error->add( 'empty_username', __( '<strong>E RROR</strong>: The username field is empty.' ) );137 $error->add( 'empty_username', __( '<strong>Error</strong>: The username field is empty.' ) ); 138 138 } 139 139 140 140 if ( empty( $password ) ) { 141 $error->add( 'empty_password', __( '<strong>E RROR</strong>: The password field is empty.' ) );141 $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) ); 142 142 } 143 143 … … 173 173 sprintf( 174 174 /* translators: %s: User name. */ 175 __( '<strong>E RROR</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.' ), 176 176 '<strong>' . $username . '</strong>' 177 177 ) . … … 210 210 if ( empty( $email ) ) { 211 211 // Uses 'empty_username' for back-compat with wp_signon(). 212 $error->add( 'empty_username', __( '<strong>E RROR</strong>: The email field is empty.' ) );212 $error->add( 'empty_username', __( '<strong>Error</strong>: The email field is empty.' ) ); 213 213 } 214 214 215 215 if ( empty( $password ) ) { 216 $error->add( 'empty_password', __( '<strong>E RROR</strong>: The password field is empty.' ) );216 $error->add( 'empty_password', __( '<strong>Error</strong>: The password field is empty.' ) ); 217 217 } 218 218 … … 245 245 sprintf( 246 246 /* translators: %s: Email address. */ 247 __( '<strong>E RROR</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.' ), 248 248 '<strong>' . $email . '</strong>' 249 249 ) . … … 320 320 321 321 if ( $spammed ) { 322 return new WP_Error( 'spammer_account', __( '<strong>E RROR</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.' ) ); 323 323 } 324 324 } … … 2266 2266 2267 2267 if ( ! ( $user instanceof WP_User ) ) { 2268 return new WP_Error( 'invalidcombo', __( '<strong>E RROR</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.' ) ); 2269 2269 } 2270 2270 … … 2495 2495 // Check the username. 2496 2496 if ( $sanitized_user_login == '' ) { 2497 $errors->add( 'empty_username', __( '<strong>E RROR</strong>: Please enter a username.' ) );2497 $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) ); 2498 2498 } elseif ( ! validate_username( $user_login ) ) { 2499 $errors->add( 'invalid_username', __( '<strong>E RROR</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.' ) ); 2500 2500 $sanitized_user_login = ''; 2501 2501 } elseif ( username_exists( $sanitized_user_login ) ) { 2502 $errors->add( 'username_exists', __( '<strong>E RROR</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.' ) ); 2503 2503 2504 2504 } else { … … 2506 2506 $illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() ); 2507 2507 if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) { 2508 $errors->add( 'invalid_username', __( '<strong>E RROR</strong>: Sorry, that username is not allowed.' ) );2508 $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) ); 2509 2509 } 2510 2510 } … … 2512 2512 // Check the email address. 2513 2513 if ( $user_email == '' ) { 2514 $errors->add( 'empty_email', __( '<strong>E RROR</strong>: Please type your email address.' ) );2514 $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) ); 2515 2515 } elseif ( ! is_email( $user_email ) ) { 2516 $errors->add( 'invalid_email', __( '<strong>E RROR</strong>: The email address isn’t correct.' ) );2516 $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ) ); 2517 2517 $user_email = ''; 2518 2518 } elseif ( email_exists( $user_email ) ) { 2519 $errors->add( 'email_exists', __( '<strong>E RROR</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.' ) ); 2520 2520 } 2521 2521 … … 2562 2562 sprintf( 2563 2563 /* translators: %s: Admin email address. */ 2564 __( '<strong>E RROR</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ),2564 __( '<strong>Error</strong>: Couldn’t register you… please contact the <a href="mailto:%s">webmaster</a> !' ), 2565 2565 get_option( 'admin_email' ) 2566 2566 ) … … 2797 2797 $errors->add( 2798 2798 'user_email', 2799 __( '<strong>E RROR</strong>: The email address isn’t correct.' ),2799 __( '<strong>Error</strong>: The email address isn’t correct.' ), 2800 2800 array( 2801 2801 'form-field' => 'email', … … 2809 2809 $errors->add( 2810 2810 'user_email', 2811 __( '<strong>E RROR</strong>: The email address is already used.' ),2811 __( '<strong>Error</strong>: The email address is already used.' ), 2812 2812 array( 2813 2813 'form-field' => 'email', -
trunk/src/wp-includes/wp-db.php
r47122 r47156 3499 3499 if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) { 3500 3500 /* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */ 3501 return new WP_Error( 'database_version', sprintf( __( '<strong>E RROR</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 ) ); 3502 3502 } 3503 3503 } -
trunk/src/wp-login.php
r47122 r47156 368 368 369 369 if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) { 370 $errors->add( 'empty_username', __( '<strong>E RROR</strong>: Enter a username or email address.' ) );370 $errors->add( 'empty_username', __( '<strong>Error</strong>: Enter a username or email address.' ) ); 371 371 } elseif ( strpos( $_POST['user_login'], '@' ) ) { 372 372 $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) ); 373 373 if ( empty( $user_data ) ) { 374 $errors->add( 'invalid_email', __( '<strong>E RROR</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.' ) ); 375 375 } 376 376 } else { … … 397 397 398 398 if ( ! $user_data ) { 399 $errors->add( 'invalidcombo', __( '<strong>E RROR</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.' ) ); 400 400 return $errors; 401 401 } … … 464 464 sprintf( 465 465 /* translators: %s: Documentation URL. */ 466 __( '<strong>E RROR</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>.' ), 467 467 esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) ) 468 468 ) … … 1207 1207 sprintf( 1208 1208 /* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */ 1209 __( '<strong>E RROR</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>.' ), 1210 1210 __( 'https://wordpress.org/support/article/cookies/' ), 1211 1211 __( 'https://wordpress.org/support/forums/' ) … … 1218 1218 sprintf( 1219 1219 /* translators: %s: Browser cookie documentation URL. */ 1220 __( '<strong>E RROR</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.' ), 1221 1221 __( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' ) 1222 1222 ) -
trunk/tests/phpunit/includes/bootstrap.php
r47122 r47156 31 31 32 32 if ( ! is_readable( $config_file_path ) ) { 33 echo "E RROR: 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"; 34 34 exit( 1 ); 35 35 } … … 40 40 if ( version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) { 41 41 printf( 42 "E RROR: 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", 43 43 tests_get_phpunit_version() 44 44 ); … … 48 48 49 49 if ( defined( 'WP_RUN_CORE_TESTS' ) && WP_RUN_CORE_TESTS && ! is_dir( ABSPATH ) ) { 50 echo "E RROR: 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"; 51 51 exit( 1 ); 52 52 } -
trunk/tests/phpunit/includes/trac.php
r47122 r47156 48 48 public static function usingLocalCache() { 49 49 echo PHP_EOL . "\x1b[0m\x1b[30;43m\x1b[2K"; 50 echo 'I NFO: 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; 51 51 echo "\x1b[0m\x1b[2K"; 52 52 } … … 55 55 public static function forcingKnownBugs() { 56 56 echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K"; 57 echo "E RROR: 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; 58 58 echo "\x1b[0m\x1b[2K"; 59 59 } -
trunk/tests/phpunit/tests/ajax/ReplytoComment.php
r47155 r47156 188 188 189 189 // Make the request. 190 $this->setExpectedException( 'WPAjaxDieStopException', 'E RROR: 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.' ); 191 191 $this->_handleAjax( 'replyto-comment' ); 192 192 }
Note:
See TracChangeset
for help on using the changeset viewer.
