![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 48115
- Timestamp:
- 06/21/2020 01:58:46 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 25 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/plugin-install.php (modified) (2 diffs)
-
src/wp-admin/includes/plugin.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/theme.php (modified) (3 diffs)
-
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) (1 diff)
-
tests/phpunit/tests/ajax/ReplytoComment.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/js/_enqueues/vendor/tinymce/langs/wp-langs-en.js
r48059 r48115 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: " 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
r48059 r48115 62 62 <?php if ( ! empty( $_GET['invalid'] ) ) : ?> 63 63 <div class="error"> 64 <p> 64 <p><strong><?php _e( 'Error:' ); ?></strong> 65 65 <?php 66 66 /* translators: %s: Importer slug. */ -
trunk/src/wp-admin/includes/ajax-actions.php
r48067 r48115 1273 1273 wp_die( 1 ); 1274 1274 } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ), true ) ) { 1275 wp_die( __( ' You can’t reply to a comment on a draft post.' ) );1275 wp_die( __( 'Error: You can’t reply to a comment on a draft post.' ) ); 1276 1276 } 1277 1277 … … 1303 1303 1304 1304 if ( '' === $comment_content ) { 1305 wp_die( __( ' Please type your comment text.' ) );1305 wp_die( __( 'Error: Please type your comment text.' ) ); 1306 1306 } 1307 1307 … … 1405 1405 1406 1406 if ( '' === $_POST['content'] ) { 1407 wp_die( __( ' Please type your comment text.' ) );1407 wp_die( __( 'Error: Please type your comment text.' ) ); 1408 1408 } 1409 1409 -
trunk/src/wp-admin/includes/file.php
r48102 r48115 2101 2101 2102 2102 if ( $error ) { 2103 $error_string = __( ' There was an error connectingto the server. Please verify the settings are correct.' );2103 $error_string = __( '<strong>Error</strong>: Could not connect to the server. Please verify the settings are correct.' ); 2104 2104 if ( is_wp_error( $error ) ) { 2105 2105 $error_string = esc_html( $error->get_error_message() ); -
trunk/src/wp-admin/includes/network.php
r48108 r48115 114 114 115 115 if ( defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) { 116 echo '<div class="error"><p> ' . sprintf(116 echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . sprintf( 117 117 /* translators: %s: DO_NOT_UPGRADE_GLOBAL_TABLES */ 118 118 __( 'The constant %s cannot be defined when creating a network.' ), … … 140 140 $has_ports = strstr( $hostname, ':' ); 141 141 if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) { 142 echo '<div class="error"><p><strong>' . __( ' You cannot install a network of sites with your server address.' ) . '</p></div>';142 echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>'; 143 143 echo '<p>' . sprintf( 144 144 /* translators: %s: Port number. */ … … 158 158 $error_codes = array(); 159 159 if ( is_wp_error( $errors ) ) { 160 echo '<div class="error"><p><strong>' . __( ' The network could not be created.' ) . '</strong></p>';160 echo '<div class="error"><p><strong>' . __( 'Error: The network could not be created.' ) . '</strong></p>'; 161 161 foreach ( $errors->get_error_messages() as $error ) { 162 162 echo "<p>$error</p>"; -
trunk/src/wp-admin/includes/plugin-install.php
r48110 r48115 802 802 if ( ! $compatible_php ) { 803 803 echo '<div class="notice notice-error notice-alt"><p>'; 804 _e( ' This plugin <strong>requires a newer version of PHP</strong>.' );804 _e( '<strong>Error:</strong> This plugin <strong>requires a newer version of PHP</strong>.' ); 805 805 if ( current_user_can( 'update_php' ) ) { 806 806 printf( … … 823 823 } elseif ( ! $compatible_wp ) { 824 824 echo '<div class="notice notice-error notice-alt"><p>'; 825 _e( ' This plugin <strong>requires a newer version of WordPress</strong>.' );825 _e( '<strong>Error:</strong> This plugin <strong>requires a newer version of WordPress</strong>.' ); 826 826 if ( current_user_can( 'update_core' ) ) { 827 827 printf( -
trunk/src/wp-admin/includes/plugin.php
r48105 r48115 1154 1154 sprintf( 1155 1155 /* translators: %s: Plugin name. */ 1156 _x( ' Current WordPress and PHP versions do not meet minimum requirements for %s.', 'plugin' ),1156 _x( '<strong>Error:</strong> Current WordPress and PHP versions do not meet minimum requirements for %s.', 'plugin' ), 1157 1157 $plugin_headers['Name'] 1158 1158 ) … … 1163 1163 sprintf( 1164 1164 /* translators: %s: Plugin name. */ 1165 _x( ' Current PHP version does not meet minimum requirements for %s.', 'plugin' ),1165 _x( '<strong>Error:</strong> Current PHP version does not meet minimum requirements for %s.', 'plugin' ), 1166 1166 $plugin_headers['Name'] 1167 1167 ) … … 1172 1172 sprintf( 1173 1173 /* translators: %s: Plugin name. */ 1174 _x( ' Current WordPress version does not meet minimum requirements for %s.', 'plugin' ),1174 _x( '<strong>Error:</strong> Current WordPress version does not meet minimum requirements for %s.', 'plugin' ), 1175 1175 $plugin_headers['Name'] 1176 1176 ) -
trunk/src/wp-admin/includes/user.php
r48104 r48115 144 144 /* checking that username has been typed */ 145 145 if ( '' === $user->user_login ) { 146 $errors->add( 'user_login', __( ' Please enter a username.' ) );146 $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) ); 147 147 } 148 148 149 149 /* checking that nickname has been typed */ 150 150 if ( $update && empty( $user->nickname ) ) { 151 $errors->add( 'nickname', __( ' Please enter a nickname.' ) );151 $errors->add( 'nickname', __( '<strong>Error</strong>: Please enter a nickname.' ) ); 152 152 } 153 153 … … 165 165 // Check for blank password when adding a user. 166 166 if ( ! $update && empty( $pass1 ) ) { 167 $errors->add( 'pass', __( ' Please enter a password.' ), array( 'form-field' => 'pass1' ) );167 $errors->add( 'pass', __( '<strong>Error</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) ); 168 168 } 169 169 170 170 // Check for "\" in password. 171 171 if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) { 172 $errors->add( 'pass', __( ' Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );172 $errors->add( 'pass', __( '<strong>Error</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) ); 173 173 } 174 174 175 175 // Checking the password has been typed twice the same. 176 176 if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) { 177 $errors->add( 'pass', __( ' Passwords don’t match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );177 $errors->add( 'pass', __( '<strong>Error</strong>: Passwords don’t match. Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) ); 178 178 } 179 179 … … 183 183 184 184 if ( ! $update && isset( $_POST['user_login'] ) && ! validate_username( $_POST['user_login'] ) ) { 185 $errors->add( 'user_login', __( ' This username is invalid because it uses illegal characters. Please enter a valid username.' ) );185 $errors->add( 'user_login', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); 186 186 } 187 187 188 188 if ( ! $update && username_exists( $user->user_login ) ) { 189 $errors->add( 'user_login', __( ' This username is already registered. Please choose another one.' ) );189 $errors->add( 'user_login', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) ); 190 190 } 191 191 … … 194 194 195 195 if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ), true ) ) { 196 $errors->add( 'invalid_username', __( ' Sorry, that username is not allowed.' ) );196 $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) ); 197 197 } 198 198 199 199 /* checking email address */ 200 200 if ( empty( $user->user_email ) ) { 201 $errors->add( 'empty_email', __( ' Please enter an email address.' ), array( 'form-field' => 'email' ) );201 $errors->add( 'empty_email', __( '<strong>Error</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) ); 202 202 } elseif ( ! is_email( $user->user_email ) ) { 203 $errors->add( 'invalid_email', __( ' The email address isn’t correct.' ), array( 'form-field' => 'email' ) );203 $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) ); 204 204 } else { 205 205 $owner_id = email_exists( $user->user_email ); 206 206 if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) { 207 $errors->add( 'email_exists', __( ' This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) );207 $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ), array( 'form-field' => 'email' ) ); 208 208 } 209 209 } -
trunk/src/wp-admin/options.php
r48059 r48115 222 222 sprintf( 223 223 /* translators: %s: The options page name. */ 224 __( ' Options page %s not found in the options whitelist.' ),224 __( '<strong>Error</strong>: Options page %s not found in the options whitelist.' ), 225 225 '<code>' . esc_html( $option_page ) . '</code>' 226 226 ) -
trunk/src/wp-admin/setup-config.php
r48059 r48115 281 281 282 282 if ( empty( $prefix ) ) { 283 wp_die( __( ' "Table Prefix" must not be empty.' ) . $tryagain_link );283 wp_die( __( '<strong>Error</strong>: "Table Prefix" must not be empty.' ) . $tryagain_link ); 284 284 } 285 285 286 286 // Validate $prefix: it can only contain letters, numbers and underscores. 287 287 if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) { 288 wp_die( __( ' "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link );288 wp_die( __( '<strong>Error</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' ) . $tryagain_link ); 289 289 } 290 290 … … 319 319 if ( ! $wpdb->last_error ) { 320 320 // MySQL was able to parse the prefix as a value, which we don't want. Bail. 321 wp_die( __( ' "Table Prefix" is invalid.' ) );321 wp_die( __( '<strong>Error</strong>: "Table Prefix" is invalid.' ) ); 322 322 } 323 323 -
trunk/src/wp-admin/themes.php
r48105 r48115 301 301 302 302 if ( $ct->errors() && ( ! is_multisite() || current_user_can( 'manage_network_themes' ) ) ) { 303 echo '<div class="error"><p>' . $ct->errors()->get_error_message() . '</p></div>';303 echo '<div class="error"><p>' . __( 'Error:' ) . ' ' . $ct->errors()->get_error_message() . '</p></div>'; 304 304 } 305 305 -
trunk/src/wp-admin/users.php
r48059 r48115 275 275 <?php if ( isset( $_REQUEST['error'] ) ) : ?> 276 276 <div class="error"> 277 <p>< ?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
r48109 r48115 256 256 ); 257 257 if ( ! file_exists( $this->theme_root ) ) { // Don't cache this one. 258 $this->errors->add( 'theme_root_missing', __( ' The themes directory is either empty or doesn’t exist. Please check your installation.' ) );258 $this->errors->add( 'theme_root_missing', __( 'Error: The themes directory is either empty or doesn’t exist. Please check your installation.' ) ); 259 259 } 260 260 return; -
trunk/src/wp-includes/comment.php
r48110 r48115 1244 1244 1245 1245 if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) { 1246 return new WP_Error( 'comment_author_column_length', __( ' Your name is too long.' ), 200 );1246 return new WP_Error( 'comment_author_column_length', __( '<strong>Error</strong>: Your name is too long.' ), 200 ); 1247 1247 } 1248 1248 1249 1249 if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) { 1250 return new WP_Error( 'comment_author_email_column_length', __( ' Your email address is too long.' ), 200 );1250 return new WP_Error( 'comment_author_email_column_length', __( '<strong>Error</strong>: Your email address is too long.' ), 200 ); 1251 1251 } 1252 1252 1253 1253 if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) { 1254 return new WP_Error( 'comment_author_url_column_length', __( ' Your URL is too long.' ), 200 );1254 return new WP_Error( 'comment_author_url_column_length', __( '<strong>Error</strong>: Your URL is too long.' ), 200 ); 1255 1255 } 1256 1256 1257 1257 if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) { 1258 return new WP_Error( 'comment_content_column_length', __( ' Your comment is too long.' ), 200 );1258 return new WP_Error( 'comment_content_column_length', __( '<strong>Error</strong>: Your comment is too long.' ), 200 ); 1259 1259 } 1260 1260 … … 3399 3399 if ( get_option( 'require_name_email' ) && ! $user->exists() ) { 3400 3400 if ( '' == $comment_author_email || '' == $comment_author ) { 3401 return new WP_Error( 'require_name_email', __( ' Please fill the required fields (name, email).' ), 200 );3401 return new WP_Error( 'require_name_email', __( '<strong>Error</strong>: Please fill the required fields (name, email).' ), 200 ); 3402 3402 } elseif ( ! is_email( $comment_author_email ) ) { 3403 return new WP_Error( 'require_valid_email', __( ' Please enter a valid email address.' ), 200 );3403 return new WP_Error( 'require_valid_email', __( '<strong>Error</strong>: Please enter a valid email address.' ), 200 ); 3404 3404 } 3405 3405 } … … 3426 3426 $allow_empty_comment = apply_filters( 'allow_empty_comment', false, $commentdata ); 3427 3427 if ( '' === $comment_content && ! $allow_empty_comment ) { 3428 return new WP_Error( 'require_valid_comment', __( ' Please type your comment text.' ), 200 );3428 return new WP_Error( 'require_valid_comment', __( '<strong>Error</strong>: Please type your comment text.' ), 200 ); 3429 3429 } 3430 3430 … … 3440 3440 3441 3441 if ( ! $comment_id ) { 3442 return new WP_Error( 'comment_save_error', __( ' The comment could not be saved. Please try again later.' ), 500 );3442 return new WP_Error( 'comment_save_error', __( '<strong>Error</strong>: The comment could not be saved. Please try again later.' ), 500 ); 3443 3443 } 3444 3444 -
trunk/src/wp-includes/functions.php
r48110 r48115 1551 1551 1552 1552 if ( ! has_action( "do_feed_{$feed}" ) ) { 1553 wp_die( __( ' This is not a valid feed template.' ), '', array( 'response' => 404 ) );1553 wp_die( __( 'Error: This is not a valid feed template.' ), '', array( 'response' => 404 ) ); 1554 1554 } 1555 1555 -
trunk/src/wp-includes/load.php
r48109 r48115 549 549 sprintf( 550 550 /* translators: 1: $table_prefix, 2: wp-config.php */ 551 __( ' %1$s in %2$s can only contain numbers, letters, and underscores.' ),551 __( '<strong>Error</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ), 552 552 '<code>$table_prefix</code>', 553 553 '<code>wp-config.php</code>' -
trunk/src/wp-includes/ms-deprecated.php
r48059 r48115 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 __( ' Site URL you’ve entered is already taken.' );404 return __( '<strong>Error</strong>: Site URL you’ve entered is already taken.' ); 405 405 406 406 /* … … 411 411 412 412 if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) 413 return __( ' There was a problem creating site entry.' );413 return __( '<strong>Error</strong>: There was a problem creating site entry.' ); 414 414 415 415 switch_to_blog($blog_id); -
trunk/src/wp-includes/pluggable.php
r48109 r48115 548 548 // TODO: What should the error message be? (Or would these even happen?) 549 549 // Only needed if all authentication handlers fail to return anything. 550 $user = new WP_Error( 'authentication_failed', __( ' Invalid username, email address or incorrect password.' ) );550 $user = new WP_Error( 'authentication_failed', __( '<strong>Error</strong>: Invalid username, email address or incorrect password.' ) ); 551 551 } 552 552 -
trunk/src/wp-includes/theme.php
r48109 r48115 930 930 sprintf( 931 931 /* translators: %s: Theme name. */ 932 _x( ' Current WordPress and PHP versions do not meet minimum requirements for %s.', 'theme' ),932 _x( '<strong>Error:</strong> Current WordPress and PHP versions do not meet minimum requirements for %s.', 'theme' ), 933 933 $theme->display( 'Name' ) 934 934 ) … … 939 939 sprintf( 940 940 /* translators: %s: Theme name. */ 941 _x( ' Current PHP version does not meet minimum requirements for %s.', 'theme' ),941 _x( '<strong>Error:</strong> Current PHP version does not meet minimum requirements for %s.', 'theme' ), 942 942 $theme->display( 'Name' ) 943 943 ) … … 948 948 sprintf( 949 949 /* translators: %s: Theme name. */ 950 _x( ' Current WordPress version does not meet minimum requirements for %s.', 'theme' ),950 _x( '<strong>Error:</strong> Current WordPress version does not meet minimum requirements for %s.', 'theme' ), 951 951 $theme->display( 'Name' ) 952 952 ) -
trunk/src/wp-includes/user.php
r48107 r48115 135 135 136 136 if ( empty( $username ) ) { 137 $error->add( 'empty_username', __( ' 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', __( ' 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 __( ' 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', __( ' 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', __( ' 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 __( ' 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', __( ' 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 } … … 2284 2284 2285 2285 if ( ! ( $user instanceof WP_User ) ) { 2286 return new WP_Error( 'invalidcombo', __( ' There is no account with that username or email address.' ) );2286 return new WP_Error( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) ); 2287 2287 } 2288 2288 … … 2513 2513 // Check the username. 2514 2514 if ( '' === $sanitized_user_login ) { 2515 $errors->add( 'empty_username', __( ' Please enter a username.' ) );2515 $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) ); 2516 2516 } elseif ( ! validate_username( $user_login ) ) { 2517 $errors->add( 'invalid_username', __( ' This username is invalid because it uses illegal characters. Please enter a valid username.' ) );2517 $errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) ); 2518 2518 $sanitized_user_login = ''; 2519 2519 } elseif ( username_exists( $sanitized_user_login ) ) { 2520 $errors->add( 'username_exists', __( ' This username is already registered. Please choose another one.' ) );2520 $errors->add( 'username_exists', __( '<strong>Error</strong>: This username is already registered. Please choose another one.' ) ); 2521 2521 2522 2522 } else { … … 2524 2524 $illegal_user_logins = (array) apply_filters( 'illegal_user_logins', array() ); 2525 2525 if ( in_array( strtolower( $sanitized_user_login ), array_map( 'strtolower', $illegal_user_logins ), true ) ) { 2526 $errors->add( 'invalid_username', __( ' Sorry, that username is not allowed.' ) );2526 $errors->add( 'invalid_username', __( '<strong>Error</strong>: Sorry, that username is not allowed.' ) ); 2527 2527 } 2528 2528 } … … 2530 2530 // Check the email address. 2531 2531 if ( '' === $user_email ) { 2532 $errors->add( 'empty_email', __( ' Please type your email address.' ) );2532 $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) ); 2533 2533 } elseif ( ! is_email( $user_email ) ) { 2534 $errors->add( 'invalid_email', __( ' The email address isn’t correct.' ) );2534 $errors->add( 'invalid_email', __( '<strong>Error</strong>: The email address isn’t correct.' ) ); 2535 2535 $user_email = ''; 2536 2536 } elseif ( email_exists( $user_email ) ) { 2537 $errors->add( 'email_exists', __( ' This email is already registered. Please choose another one.' ) );2537 $errors->add( 'email_exists', __( '<strong>Error</strong>: This email is already registered. Please choose another one.' ) ); 2538 2538 } 2539 2539 … … 2580 2580 sprintf( 2581 2581 /* translators: %s: Admin email address. */ 2582 __( ' Couldn’t register you… please contact the <a href="mailto:%s">site admin</a>!' ),2582 __( '<strong>Error</strong>: Couldn’t register you… please contact the <a href="mailto:%s">site admin</a>!' ), 2583 2583 get_option( 'admin_email' ) 2584 2584 ) … … 2816 2816 $errors->add( 2817 2817 'user_email', 2818 __( ' The email address isn’t correct.' ),2818 __( '<strong>Error</strong>: The email address isn’t correct.' ), 2819 2819 array( 2820 2820 'form-field' => 'email', … … 2828 2828 $errors->add( 2829 2829 'user_email', 2830 __( ' The email address is already used.' ),2830 __( '<strong>Error</strong>: The email address is already used.' ), 2831 2831 array( 2832 2832 'form-field' => 'email', -
trunk/src/wp-includes/wp-db.php
r48100 r48115 3531 3531 if ( version_compare( $this->db_version(), $required_mysql_version, '<' ) ) { 3532 3532 /* translators: 1: WordPress version number, 2: Minimum required MySQL version number. */ 3533 return new WP_Error( 'database_version', sprintf( __( ' WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ) );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 ) ); 3534 3534 } 3535 3535 } -
trunk/src/wp-login.php
r48085 r48115 359 359 360 360 if ( empty( $_POST['user_login'] ) || ! is_string( $_POST['user_login'] ) ) { 361 $errors->add( 'empty_username', __( ' Please enter a username or email address.' ) );361 $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username or email address.' ) ); 362 362 } elseif ( strpos( $_POST['user_login'], '@' ) ) { 363 363 $user_data = get_user_by( 'email', trim( wp_unslash( $_POST['user_login'] ) ) ); 364 364 if ( empty( $user_data ) ) { 365 $errors->add( 'invalid_email', __( ' There is no account with that username or email address.' ) );365 $errors->add( 'invalid_email', __( '<strong>Error</strong>: There is no account with that username or email address.' ) ); 366 366 } 367 367 } else { … … 405 405 406 406 if ( ! $user_data ) { 407 $errors->add( 'invalidcombo', __( ' There is no account with that username or email address.' ) );407 $errors->add( 'invalidcombo', __( '<strong>Error</strong>: There is no account with that username or email address.' ) ); 408 408 return $errors; 409 409 } … … 472 472 sprintf( 473 473 /* translators: %s: Documentation URL. */ 474 __( ' 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>.' ),474 __( '<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>.' ), 475 475 esc_url( __( 'https://wordpress.org/support/article/resetting-your-password/' ) ) 476 476 ) … … 1215 1215 sprintf( 1216 1216 /* translators: 1: Browser cookie documentation URL, 2: Support forums URL. */ 1217 __( ' 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>.' ),1217 __( '<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>.' ), 1218 1218 __( 'https://wordpress.org/support/article/cookies/' ), 1219 1219 __( 'https://wordpress.org/support/forums/' ) … … 1226 1226 sprintf( 1227 1227 /* translators: %s: Browser cookie documentation URL. */ 1228 __( ' Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ),1228 __( '<strong>Error</strong>: Cookies are blocked or not supported by your browser. You must <a href="%s">enable cookies</a> to use WordPress.' ), 1229 1229 __( 'https://wordpress.org/support/article/cookies/#enable-cookies-in-your-browser' ) 1230 1230 ) -
trunk/tests/phpunit/includes/bootstrap.php
r48072 r48115 31 31 32 32 if ( ! is_readable( $config_file_path ) ) { 33 echo " 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(), '5.4', '<' ) || version_compare( tests_get_phpunit_version(), '8.0', '>=' ) ) { 41 41 printf( 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",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", 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 " 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
r48059 r48115 55 55 public static function forcingKnownBugs() { 56 56 echo PHP_EOL . "\x1b[0m\x1b[37;41m\x1b[2K"; 57 echo " 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
r48059 r48115 188 188 189 189 // Make the request. 190 $this->setExpectedException( 'WPAjaxDieStopException', ' You can’t reply to a comment on a draft post.' );190 $this->setExpectedException( 'WPAjaxDieStopException', 'Error: You can’t reply 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.
