From 99fa347879b856c6c62803928963b43d92b5ee6d Mon Sep 17 00:00:00 2001
From: Helen Hou-Sandi <helen@git.wordpress.org>
Date: Wed, 25 Sep 2013 16:13:44 +0000
Subject: [PATCH] Better error messaging on install.php. props DrewAPicture,
 ocean90. fixes #24982.

git-svn-id: https://develop.svn.wordpress.org/trunk@25620 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/install.css |  8 +++++---
 src/wp-admin/install.php     | 12 ++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/wp-admin/css/install.css b/src/wp-admin/css/install.css
index 1b33764ab2..03c0e98a6a 100644
--- a/src/wp-admin/css/install.css
+++ b/src/wp-admin/css/install.css
@@ -215,10 +215,12 @@ textarea {
 }
 
 .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;
 }
 
 /* install-rtl */
diff --git a/src/wp-admin/install.php b/src/wp-admin/install.php
index b5d71cee5d..15216e4600 100644
--- a/src/wp-admin/install.php
+++ b/src/wp-admin/install.php
@@ -91,7 +91,7 @@ function display_setup_form( $error = null ) {
 
 	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">
 	<table class="form-table">
@@ -199,22 +199,22 @@ switch($step) {
 		$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;
 		}