Changeset 38477

Timestamp:

08/31/2016 06:50:34 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Login and Registration: Change login label to Username or Email Address for clarity.

Props GaryJ.
Fixes #37871.

Location:

trunk/src

Files:

• wp-includes/general-template.php (modified) (2 diffs)
• wp-login.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -384 +384 @@
  *                                  Default is to redirect back to the request URI.
  *     @type string $form_id        ID attribute value for the form. Default 'loginform'.
- *     @type string $label_username Label for the username or email address field. Default 'Username or Email'.
+ *     @type string $label_username Label for the username or email address field. Default 'Username or Email Address'.
  *     @type string $label_password Label for the password field. Default 'Password'.
  *     @type string $label_remember Label for the remember field. Default 'Remember Me'.
@@ -406 +406 @@
         'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
         'form_id' => 'loginform',
-        'label_username' => __( 'Username or Email' ),
+        'label_username' => __( 'Username or Email Address' ),
         'label_password' => __( 'Password' ),
         'label_remember' => __( 'Remember Me' ),

trunk/src/wp-login.php

@@ -537 +537 @@
 <form name="lostpasswordform" id="lostpasswordform" action="<?php echo esc_url( network_site_url( 'wp-login.php?action=lostpassword', 'login_post' ) ); ?>" method="post">
     <p>
-        <label for="user_login" ><?php _e('Username or Email') ?><br />
+        <label for="user_login" ><?php _e( 'Username or Email Address' ); ?><br />
         <input type="text" name="user_login" id="user_login" class="input" value="<?php echo esc_attr($user_login); ?>" size="20" /></label>
     </p>
@@ -899 +899 @@
 <form name="loginform" id="loginform" action="<?php echo esc_url( site_url( 'wp-login.php', 'login_post' ) ); ?>" method="post">
     <p>
-        <label for="user_login"><?php _e('Username or Email') ?><br />
+        <label for="user_login"><?php _e( 'Username or Email Address' ); ?><br />
         <input type="text" name="log" id="user_login"<?php echo $aria_describedby_error; ?> class="input" value="<?php echo esc_attr( $user_login ); ?>" size="20" /></label>
     </p>
     <p>
-        <label for="user_pass"><?php _e('Password') ?><br />
+        <label for="user_pass"><?php _e( 'Password' ); ?><br />
         <input type="password" name="pwd" id="user_pass"<?php echo $aria_describedby_error; ?> class="input" value="" size="20" /></label>
     </p>