WordPress.org

Make WordPress Core

Changeset 25620


Ignore:
Timestamp:
09/25/2013 04:13:44 PM (6 years ago)
Author:
helen
Message:

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

Location:
trunk/src/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/css/install.css

    r22629 r25620  
    216216
    217217.message {
    218     border: 1px solid #e6db55;
    219     padding: 0.3em 0.6em;
     218    border: 1px solid #c00;
     219    -webkit-border-radius: 3px;
     220    border-radius:         3px;
     221    padding: 0.5em 0.7em;
    220222    margin: 5px 0 15px;
    221     background-color: #ffffe0;
     223    background-color: #ffebe8;
    222224}
    223225
  • trunk/src/wp-admin/install.php

    r25616 r25620  
    9292    if ( ! is_null( $error ) ) {
    9393?>
    94 <p class="message"><?php printf( __( '<strong>ERROR</strong>: %s' ), $error ); ?></p>
     94<p class="message"><?php echo $error; ?></p>
    9595<?php } ?>
    9696<form id="setup" method="post" action="install.php?step=2">
     
    200200        if ( empty( $user_name ) ) {
    201201            // TODO: poka-yoke
    202             display_setup_form( __('you must provide a valid username.') );
     202            display_setup_form( __( 'Please provide a valid username.' ) );
    203203            $error = true;
    204204        } 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.' ) );
    206206            $error = true;
    207207        } elseif ( $admin_password != $admin_password_check ) {
    208208            // 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' ) );
    210210            $error = true;
    211211        } else if ( empty( $admin_email ) ) {
    212212            // TODO: poka-yoke
    213             display_setup_form( __( 'you must provide an e-mail address.' ) );
     213            display_setup_form( __( 'You must provide an email address.' ) );
    214214            $error = true;
    215215        } elseif ( ! is_email( $admin_email ) ) {
    216216            // TODO: poka-yoke
    217             display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
     217            display_setup_form( __( 'Sorry, that isn&#8217;t a valid email address. Email addresses look like: <code>username@example.com</code>' ) );
    218218            $error = true;
    219219        }
Note: See TracChangeset for help on using the changeset viewer.