Ticket #24982: 24982.3.diff
| File 24982.3.diff, 2.2 KB (added by , 13 years ago) |
|---|
-
wp-admin/css/install.css
215 215 } 216 216 217 217 .message { 218 border: 1px solid #e6db55; 219 padding: 0.3em 0.6em; 218 border: 1px solid #c00; 219 border-radius: 3px; 220 padding: 0.5em 0.7em; 220 221 margin: 5px 0 15px; 221 background-color: #ff ffe0;222 background-color: #ffebe8; 222 223 } 223 224 224 225 /* install-rtl */ -
wp-admin/install.php
91 91 92 92 if ( ! is_null( $error ) ) { 93 93 ?> 94 <p class="message"><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p>94 <p class="message"><?php echo $error; ?></p> 95 95 <?php } ?> 96 96 <form id="setup" method="post" action="install.php?step=2"> 97 97 <table class="form-table"> … … 199 199 $error = false; 200 200 if ( empty( $user_name ) ) { 201 201 // TODO: poka-yoke 202 display_setup_form( __( 'you must provide a valid username.') );202 display_setup_form( __( 'Please provide a valid username.' ) ); 203 203 $error = true; 204 204 } elseif ( $user_name != sanitize_user( $user_name, true ) ) { 205 display_setup_form( __( 'the username you provided has invalid characters.') );205 display_setup_form( __( 'The username you provided has invalid characters.' ) ); 206 206 $error = true; 207 207 } elseif ( $admin_password != $admin_password_check ) { 208 208 // TODO: poka-yoke 209 display_setup_form( __( ' your passwords do not match. Please try again' ) );209 display_setup_form( __( 'Your passwords do not match. Please try again' ) ); 210 210 $error = true; 211 211 } else if ( empty( $admin_email ) ) { 212 212 // TODO: poka-yoke 213 display_setup_form( __( ' you must provide an e-mail address.' ) );213 display_setup_form( __( 'You must provide an email address.' ) ); 214 214 $error = true; 215 215 } elseif ( ! is_email( $admin_email ) ) { 216 216 // TODO: poka-yoke 217 display_setup_form( __( ' that isn’t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );217 display_setup_form( __( 'Sorry, that isn’t a valid email address. Email addresses look like: <code>username@example.com</code>' ) ); 218 218 $error = true; 219 219 } 220 220