Changeset 25620

Timestamp:

09/25/2013 04:13:44 PM (13 years ago)

Author:

helen

Message:

Better error messaging on install.php. props DrewAPicture, ocean90. fixes #24982.

Location:

trunk/src/wp-admin

Files:

• css/install.css (modified) (1 diff)
• install.php (modified) (2 diffs)

trunk/src/wp-admin/css/install.css

@@ -216 +216 @@
 
 .message {
-    border: 1px solid #e6db55;
-    padding: 0.3em 0.6em;
+    border: 1px solid #c00;
+    -webkit-border-radius: 3px;
+    border-radius:         3px;
+    padding: 0.5em 0.7em;
     margin: 5px 0 15px;
-    background-color: #ffffe0;
+    background-color: #ffebe8;
 }
 

trunk/src/wp-admin/install.php

@@ -92 +92 @@
     if ( ! is_null( $error ) ) {
 ?>
-<p class="message"><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p>
+<p class="message"><?php echo $error; ?></p>
 <?php } ?>
 <form id="setup" method="post" action="install.php?step=2">
@@ -200 +200 @@
         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;
         }