diff --git a/wp-admin/install.php b/wp-admin/install.php index 65e7f6f9d7..3e0d2d5b2b 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -193,11 +193,11 @@ upgrade_all();

-

log in with the login "admin" and password "%2$s".'), '../wp-login.php', $random_password); ?>

+

log in with the username "admin" and password "%2$s".'), '../wp-login.php', $random_password); ?>

Note that password carefully! It is a random password that was generated just for you. If you lose it, you will have to delete the tables from the database yourself, and re-install WordPress. So to review:'); ?>

-
+
admin
diff --git a/wp-admin/profile.php b/wp-admin/profile.php index 3e71b2fb59..db9d1be08a 100644 --- a/wp-admin/profile.php +++ b/wp-admin/profile.php @@ -30,7 +30,7 @@ case 'update': /* checking the nickname has been typed */ if (empty($_POST["newuser_nickname"])) { - die (__("ERROR: please enter your nickname (can be the same as your login)")); + die (__("ERROR: please enter your nickname (can be the same as your username)")); return false; } @@ -144,7 +144,7 @@ if (isset($updated)) { ?> - + diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index a8e451242f..9bc702c8fc 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -30,7 +30,7 @@ if ($edituser->user_level >= $user_level) die( __('You do not have permission to /* checking the nickname has been typed */ if (empty($_POST["new_nickname"])) { - die (__("ERROR: please enter your nickname (can be the same as your login)")); + die (__("ERROR: please enter your nickname (can be the same as your username)")); return false; } @@ -99,7 +99,7 @@ if ($edituser->user_level >= $user_level) die( __('You do not have permission to
user_login; ?>
- + @@ -209,4 +209,4 @@ break; } include('admin-footer.php'); -?> \ No newline at end of file +?> diff --git a/wp-admin/users.php b/wp-admin/users.php index 5628d24a3d..48aed16359 100644 --- a/wp-admin/users.php +++ b/wp-admin/users.php @@ -32,9 +32,9 @@ case 'adduser': $user_lastname = wp_specialchars($_POST['lastname']); $user_uri = wp_specialchars($_POST['uri']); - /* checking login has been typed */ + /* checking that username has been typed */ if ($user_login == '') - die (__('ERROR: Please enter a login.')); + die (__('ERROR: Please enter a username.')); /* checking the password has been typed twice */ do_action('check_passwords', array($user_login, &$pass1, &$pass2)); @@ -47,10 +47,10 @@ case 'adduser': $user_nickname = $user_login; - /* checking the login isn't already used by another user */ + /* checking that the username isn't already used by another user */ $loginthere = $wpdb->get_var("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'"); if ($loginthere) - die (__('ERROR: This login is already registered, please choose another one.')); + die (__('ERROR: This username is already registered, please choose another one.')); /* checking e-mail address */ if (empty($_POST["email"])) { @@ -82,7 +82,7 @@ case 'adduser': $user_login = stripslashes($user_login); $message = 'New user registration on your blog ' . get_settings('blogname') . ":\r\n\r\n"; - $message .= "Login: $user_login\r\n\r\nE-mail: $user_email"; + $message .= "Username: $user_login\r\n\r\nE-mail: $user_email"; @wp_mail(get_settings('admin_email'), '[' . get_settings('blogname') . '] New User Registration', $message); header('Location: users.php'); diff --git a/wp-includes/functions.php b/wp-includes/functions.php index e1965ac3e8..f767bcb5a6 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -1678,7 +1678,7 @@ function wp_login($username, $password, $already_md5 = false) { $login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'"); if (!$login) { - $error = __('Error: Wrong login.'); + $error = __('Error: Wrong username.'); return false; } else { // If the password is already_md5, it has been double hashed. diff --git a/wp-login.php b/wp-login.php index 9ae31b6d24..a912bb547e 100644 --- a/wp-login.php +++ b/wp-login.php @@ -66,9 +66,9 @@ if ($error)

-

-


@@ -101,8 +101,9 @@ case 'retrievepassword': $key = substr( md5( uniqid( microtime() ) ), 0, 50); // now insert the new pass md5'd into the db $wpdb->query("UPDATE $wpdb->users SET user_activation_key = '$key' WHERE user_login = '$user_login'"); - $message .= __("Someone has asked to reset a password for the login this site\n\n " . get_option('siteurl') ) . "\n\n"; - $message .= __('Login') . ": $user_login\r\n\r\n"; + $message .= __("Someone has asked to reset the password for the following site and username.\n\n"); + $message .= get_option('siteurl') . "\n\n"; + $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= __("To reset your password visit the following address, otherwise just ignore this email and nothing will happen.\n\n"); $message .= get_settings('siteurl') . "/wp-login.php?action=resetpass&key=$key"; @@ -132,8 +133,8 @@ case 'resetpass' : $new_pass = substr( md5( uniqid( microtime() ) ), 0, 7); $wpdb->query("UPDATE $wpdb->users SET user_pass = MD5('$new_pass'), user_activation_key = '' WHERE user_login = '$user->user_login'"); - $message = __('Login') . ": $user->user_login\r\n"; - $message .= __('Password') . ": $new_pass\r\n"; + $message = sprintf(__('Username: %s'), $user->user_login) . "\r\n"; + $message .= sprintf(__('Password: %s'), $new_pass) . "\r\n"; $message .= get_settings('siteurl') . '/wp-login.php'; $m = wp_mail($user->user_email, sprintf(__("[%s] Your new password"), get_settings('blogname')), $message); @@ -222,8 +223,8 @@ if ( $error ) ?> -

-

+

+

@@ -244,4 +245,4 @@ if ( $error ) break; } // end action switch -?> \ No newline at end of file +?> diff --git a/wp-register.php b/wp-register.php index fc86701e8b..e7b90e41d9 100644 --- a/wp-register.php +++ b/wp-register.php @@ -28,9 +28,9 @@ case 'register': $user_login = $_POST['user_login']; $user_email = $_POST['user_email']; - /* checking login has been typed */ + /* checking that username has been typed */ if ($user_login == '') { - die (__('ERROR: Please enter a login.')); + die (__('ERROR: Please enter a username.')); } /* checking e-mail address */ @@ -40,10 +40,10 @@ case 'register': die (__('ERROR: The email address isn’t correct.')); } - /* checking the login isn't already used by another user */ + /* checking the username isn't already used by another user */ $result = $wpdb->get_results("SELECT user_login FROM $wpdb->users WHERE user_login = '$user_login'"); if (count($result) >= 1) { - die (__('ERROR: This login is already registered, please choose another one.')); + die (__('ERROR: This username is already registered, please choose another one.')); } $user_ip = $_SERVER['REMOTE_ADDR'] ; @@ -73,13 +73,13 @@ case 'register': $stars .= '*'; } - $message = __('Login') . ": $user_login\r\n"; - $message .= __('Password') . ": $password\r\n"; + $message = sprintf(__('Username: %s'), $user_login) . "\r\n"; + $message .= sprintf(__('Password: %s'), $password) . "\r\n"; $message .= get_settings('siteurl') . '/wp-login.php'; - wp_mail($user_email, sprintf(__("[%s] Your login information"), get_settings('blogname')), $message); + wp_mail($user_email, sprintf(__("[%s] Your username and password"), get_settings('blogname')), $message); - $message = sprintf(__("New user registration on your blog %1\$s:\n\nLogin: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email); + $message = sprintf(__("New user registration on your blog %1\$s:\n\nUsername: %2\$s \n\nE-mail: %3\$s"), get_settings('blogname'), $user_login, $user_email); @wp_mail(get_settings('admin_email'), sprintf(__('[%s] New User Registration'), get_settings('blogname')), $message); @@ -100,9 +100,9 @@ case 'register':

-


- emailed to you
-

+

$user_login") ?>
+ ' . __('emailed to you') . '') ?>
+ $user_email") ?>

»

@@ -160,8 +160,8 @@ default:

-

-

:

+

+


A password will be emailed to you.

@@ -178,4 +178,4 @@ default: break; } -?> \ No newline at end of file +?>