From 67b3b12fa531e42a4501a5df4558802a4927eba9 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Thu, 20 Nov 2008 03:23:15 +0000 Subject: [PATCH] "Login" is a noun. The verb is "Log In" git-svn-id: http://svn.automattic.com/wordpress/trunk@9804 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/general-template.php | 4 ++-- wp-login.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index 14f5c5f56..ff21a295e 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -121,8 +121,8 @@ function get_search_form() { /** * Display the Log In/Out link. * - * Displays a link, which allows the user to navigate to the Login page to login - * or logout depending on whether or not they are currently logged in. + * Displays a link, which allows the user to navigate to the Log In page to log in + * or log out depending on whether or not they are currently logged in. * * @since 1.5.0 * @uses apply_filters() Calls 'loginout' hook on HTML link content. diff --git a/wp-login.php b/wp-login.php index d9cfb480c..dee260eec 100644 --- a/wp-login.php +++ b/wp-login.php @@ -25,7 +25,7 @@ if ( force_ssl_admin() && !is_ssl() ) { /** * Outputs the header for the login page. * - * @uses do_action() Calls the 'login_head' for outputting HTML in the Login + * @uses do_action() Calls the 'login_head' for outputting HTML in the Log In * header. * @uses apply_filters() Calls 'login_headerurl' for the top login link. * @uses apply_filters() Calls 'login_headertitle' for the top login title. @@ -33,12 +33,12 @@ if ( force_ssl_admin() && !is_ssl() ) { * header. * @uses $error The error global, which is checked for displaying errors. * - * @param string $title Optional. WordPress Login Page title to display in + * @param string $title Optional. WordPress Log In Page title to display in * element. * @param string $message Optional. Message to display in header. * @param WP_Error $wp_error Optional. WordPress Error Object */ -function login_header($title = 'Login', $message = '', $wp_error = '') { +function login_header($title = 'Log In', $message = '', $wp_error = '') { global $error; if ( empty($wp_error) ) @@ -456,7 +456,7 @@ default: elseif ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] ) $errors->add('newpass', __('Check your e-mail for your new password.'), 'message'); elseif ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] ) $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message'); - login_header(__('Login'), '', $errors); + login_header(__('Log In'), '', $errors); if ( isset($_POST['log']) ) $user_login = ( 'incorrect_password' == $errors->get_error_code() || 'empty_password' == $errors->get_error_code() ) ? attribute_escape(stripslashes($_POST['log'])) : '';