WordPress 4.1.2-scripts

[autoinstalls/wordpress.git] / wp-admin / install.php

diff --git a/wp-admin/install.php b/wp-admin/install.php
index 72916e4be822ae8519d98b252734f6cf7d47d11e..93c9d72f8796c62f844d9be79b00e14baf7d2b26 100644 (file)
--- a/wp-admin/install.php
+++ b/wp-admin/install.php
@@ -118,7 +118,7 @@ function display_setup_form( $error = null ) {
                                echo '<input name="user_name" type="hidden" value="admin" />';
                        } else {
                                ?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />
                                echo '<input name="user_name" type="hidden" value="admin" />';
                        } else {
                                ?><input name="user_name" type="text" id="user_login" size="25" value="<?php echo esc_attr( sanitize_user( $user_name, true ) ); ?>" />

-                               <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods and the @ symbol.' ); ?></p>
+                               <p><?php _e( 'Usernames can have only alphanumeric characters, spaces, underscores, hyphens, periods, and the @ symbol.' ); ?></p>

                        <?php
                        } ?>
                        </td>
                        <?php
                        } ?>
                        </td>


@@ -133,7 +133,7 @@ function display_setup_form( $error = null ) {
                                <input name="admin_password" type="password" id="pass1" size="25" value="" />
                                <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
                                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>
                                <input name="admin_password" type="password" id="pass1" size="25" value="" />
                                <p><input name="admin_password2" type="password" id="pass2" size="25" value="" /></p>
                                <div id="pass-strength-result"><?php _e('Strength indicator'); ?></div>

-                               <p><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
+                               <p><?php echo wp_get_password_hint(); ?></p>

                        </td>
                </tr>
                <?php endif; ?>
                        </td>
                </tr>
                <?php endif; ?>