Ticket #24982: 24982.diff

wp-admin/css/install.css

@@ -215 +215 @@
 }
 
 .message {
-        border: 1px solid #e6db55;
+        border: 1px solid #F04040;
         padding: 0.3em 0.6em;
         margin: 5px 0 15px;
-        background-color: #ffffe0;
+        background-color: #FFA0A0;
 }
 
 /* install-rtl */

wp-admin/install.php

@@ -91 +91 @@
 
         if ( ! is_null( $error ) ) {
 ?>
-<p class="message"><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p>
+<p class="message"><?php echo esc_html( $error ); ?></p>
 <?php } ?>
 <form id="setup" method="post" action="install.php?step=2">
         <table class="form-table">
@@ -100 +100 @@
                         <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
                 </tr>
                 <tr>
-                        <th scope="row"><label for="user_login"><?php _e('Username'); ?></label></th>
+                        <th scope="row"><label for="user_login"><?php _ex( 'Username&#42;', 'required' ); ?></label></th>
                         <td>
                         <?php
                         if ( $user_table ) {
@@ -112 +112 @@
                         } ?>
                         </td>
                 </tr>
+                <tr>
+                        <th scope="row"><label for="admin_email"><?php _e( 'Your Email&#42;' ); ?></label></th>
+                        <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
+                                <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
+                </tr>
                 <?php if ( ! $user_table ) : ?>
                 <tr>
                         <th scope="row">
@@ -127 +132 @@
                 </tr>
                 <?php endif; ?>
                 <tr>
-                        <th scope="row"><label for="admin_email"><?php _e( 'Your E-mail' ); ?></label></th>
-                        <td><input name="admin_email" type="text" id="admin_email" size="25" value="<?php echo esc_attr( $admin_email ); ?>" />
-                        <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
-                </tr>
-                <tr>
                         <th scope="row"><label for="blog_public"><?php _e( 'Privacy' ); ?></label></th>
                         <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow search engines to index this site.' ); ?></label></td>
                 </tr>
@@ -199 +199 @@
                 $error = false;
                 if ( empty( $user_name ) ) {
                         // TODO: poka-yoke
-                        display_setup_form( __('you must provide a valid username.') );
+                        display_setup_form( __( 'Please provide a valid username.' ) );
                         $error = true;
                 } elseif ( $user_name != sanitize_user( $user_name, true ) ) {
-                        display_setup_form( __('the username you provided has invalid characters.') );
+                        display_setup_form( __( 'The username you provided has invalid characters.' ) );
                         $error = true;
                 } elseif ( $admin_password != $admin_password_check ) {
                         // TODO: poka-yoke
-                        display_setup_form( __( 'your passwords do not match. Please try again' ) );
+                        display_setup_form( __( 'Your passwords do not match. Please try again' ) );
                         $error = true;
                 } else if ( empty( $admin_email ) ) {
                         // TODO: poka-yoke
-                        display_setup_form( __( 'you must provide an e-mail address.' ) );
+                        display_setup_form( __( 'You must provide an email address.' ) );
                         $error = true;
                 } elseif ( ! is_email( $admin_email ) ) {
                         // TODO: poka-yoke
-                        display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
+                        display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like: <code>username@example.com</code>' ) );
                         $error = true;
                 }
 
@@ -230 +230 @@
 
 <table class="form-table install-success">
         <tr>
-                <th><?php _e( 'Username' ); ?></th>
+                <th><?php _ex( 'Username', 'successful install' ); ?></th>
                 <td><?php echo esc_html( sanitize_user( $user_name, true ) ); ?></td>
         </tr>
         <tr>