#546356 by jhodgdon and threexk: Change 'login' verb to 'log in' in user interface.

9 files changed, 15 insertions, 15 deletions

diff --git a/INSTALL.mysql.txt b/INSTALL.mysql.txt
index a5490a5af..56bf41405 100644
--- a/INSTALL.mysql.txt
+++ b/INSTALL.mysql.txt
@@ -14,7 +14,7 @@ is the name of the new database):
   mysqladmin -u username -p create databasename
 
 MySQL will prompt for the 'username' database password and then create the
-initial database files. Next you must login and set the access database rights:
+initial database files. Next you must log in and set the access database rights:
 
   mysql -u username -p
 
diff --git a/includes/filetransfer/ftp.inc b/includes/filetransfer/ftp.inc
index e3606c291..b6046b2de 100644
--- a/includes/filetransfer/ftp.inc
+++ b/includes/filetransfer/ftp.inc
@@ -115,7 +115,7 @@ class FileTransferFTPExtension extends FileTransferFTP implements FileTransferCh
       throw new FileTransferException("Cannot connect to FTP Server, check settings");
     }
     if (!ftp_login($this->connection, $this->username, $this->password)) {
-      throw new FileTransferException("Cannot login to FTP server. Check username and password");
+      throw new FileTransferException("Cannot log in to FTP server. Check username and password");
     }
   }
 
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index b8e9a2a64..50531cefd 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -2195,11 +2195,11 @@ function theme_comment_post_forbidden($variables) {
 
       if (variable_get('user_register', 1)) {
         // Users can register themselves.
-        return t('<a href="@login">Login</a> or <a href="@register">register</a> to post comments', array('@login' => url('user/login', array('query' => $destination)), '@register' => url('user/register', array('query' => $destination))));
+        return t('<a href="@login">Log in</a> or <a href="@register">register</a> to post comments', array('@login' => url('user/login', array('query' => $destination)), '@register' => url('user/register', array('query' => $destination))));
       }
       else {
         // Only admins can add new users, no public registration.
-        return t('<a href="@login">Login</a> to post comments', array('@login' => url('user/login', array('query' => $destination))));
+        return t('<a href="@login">Log in</a> to post comments', array('@login' => url('user/login', array('query' => $destination))));
       }
     }
   }
diff --git a/modules/comment/comment.test b/modules/comment/comment.test
index 7e6495c6e..647f9d893 100644
--- a/modules/comment/comment.test
+++ b/modules/comment/comment.test
@@ -580,7 +580,7 @@ class CommentAnonymous extends CommentHelperCase {
     ));
     $this->drupalGet('node/' . $this->node->nid);
     $this->assertPattern('/<div ([^>]*?)id="comments"([^>]*?)>/', t('Comments were displayed.'));
-    $this->assertLink('Login', 1, t('Link to login was found.'));
+    $this->assertLink('Log in', 1, t('Link to log in was found.'));
     $this->assertLink('register', 1, t('Link to register was found.'));
   }
 }
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index a059718fd..8e9eba04c 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -196,7 +196,7 @@ function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) {
           $links['login'] = array(
             '#theme' => 'menu_local_action',
             '#link' => array(
-              'title' => t('<a href="@login">Login</a> to post new content in the forum.', array(
+              'title' => t('<a href="@login">Log in</a> to post new content in the forum.', array(
                 '@login' => url('user/login', array('query' => drupal_get_destination())),
               )),
               'localized_options' => array('html' => TRUE),
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 69d7aae56..03a1a86af 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -44,9 +44,9 @@ function openid_menu() {
 function openid_help($path, $arg) {
   switch ($path) {
     case 'user/%/openid':
-      $output = '<p>' . t('This site supports <a href="@openid-net">OpenID</a>, a secure way to log into many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => 'http://openid.net')) . '</p>';
+      $output = '<p>' . t('This site supports <a href="@openid-net">OpenID</a>, a secure way to log in to many websites using a single username and password. OpenID can reduce the necessity of managing many usernames and passwords for many websites.', array('@openid-net' => 'http://openid.net')) . '</p>';
       $output .= '<p>' . t('To use OpenID you must first establish an identity on a public or private OpenID server. If you do not have an OpenID and would like one, look into one of the <a href="@openid-providers">free public providers</a>. You can find out more about OpenID at <a href="@openid-net">this website</a>.', array('@openid-providers' => 'http://openid.net/get/', '@openid-net' => 'http://openid.net')) . '</p>';
-      $output .= '<p>' . t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you login, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') . '</p>';
+      $output .= '<p>' . t('If you already have an OpenID, enter the URL to your OpenID server below (e.g. myusername.openidprovider.com). Next time you log in, you will be able to use this URL instead of a regular username and password. You can have multiple OpenID servers if you like; just keep adding them here.') . '</p>';
       return $output;
     case 'admin/help#openid':
       $output = '';
@@ -66,7 +66,7 @@ function openid_help($path, $arg) {
  */
 function openid_user_insert(&$edit, $account, $category) {
   if (isset($_SESSION['openid']['values'])) {
-    // The user has registered after trying to login via OpenID.
+    // The user has registered after trying to log in via OpenID.
     if (variable_get('user_email_verification', TRUE)) {
       drupal_set_message(t('Once you have verified your e-mail address, you may log in via OpenID.'));
     }
diff --git a/modules/simpletest/drupal_web_test_case.php b/modules/simpletest/drupal_web_test_case.php
index 7ea600145..c5d2926e9 100644
--- a/modules/simpletest/drupal_web_test_case.php
+++ b/modules/simpletest/drupal_web_test_case.php
@@ -1021,7 +1021,7 @@ class DrupalWebTestCase extends DrupalTestCase {
    * populated with data of the logged in user. If you need full access to the
    * user object after logging in, it must be updated manually. If you also need
    * access to the plain-text password of the user (set by drupalCreateUser()),
-   * e.g. to login the same user again, then it must be re-assigned manually.
+   * e.g. to log in the same user again, then it must be re-assigned manually.
    * For example:
    * @code
    *   // Create a user.
@@ -1034,7 +1034,7 @@ class DrupalWebTestCase extends DrupalTestCase {
    * @endcode
    *
    * @param $user
-   *   User object representing the user to login.
+   *   User object representing the user to log in.
    *
    * @see drupalCreateUser()
    */
diff --git a/modules/user/user.module b/modules/user/user.module
index 3361f06e9..ce5c511a1 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -3184,7 +3184,7 @@ function user_register_submit($form, &$form_state) {
   if ($admin && !$notify) {
     drupal_set_message(t('Created a new user account for <a href="@url">%name</a>. No e-mail has been sent.', array('@url' => url("user/$account->uid"), '%name' => $account->name)));
   }
-  // No e-mail verification required; login user immediately.
+  // No e-mail verification required; log in user immediately.
   elseif (!$admin && !variable_get('user_email_verification', TRUE) && $account->status) {
     _user_mail_notify('register_no_approval_required', $account);
     $form_state['uid'] = $account->uid;
diff --git a/modules/user/user.pages.inc b/modules/user/user.pages.inc
index 33fe8a48a..7eff7de43 100644
--- a/modules/user/user.pages.inc
+++ b/modules/user/user.pages.inc
@@ -119,11 +119,11 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
           // user_login_finalize() also updates the login timestamp of the
           // user, which invalidates further use of the one-time login link.
           user_login_finalize();
-          drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to login. Please change your password.'));
+          drupal_set_message(t('You have just used your one-time login link. It is no longer necessary to use this link to log in. Please change your password.'));
           drupal_goto('user/' . $user->uid . '/edit');
         }
         else {
-          $form['message'] = array('#markup' => t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to login to the site and change your password.</p>', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
+          $form['message'] = array('#markup' => t('<p>This is a one-time login for %user_name and will expire on %expiration_date.</p><p>Click on this button to log in to the site and change your password.</p>', array('%user_name' => $account->name, '%expiration_date' => format_date($timestamp + $timeout))));
           $form['help'] = array('#markup' => '<p>' . t('This login can be used only once.') . '</p>');
           $form['submit'] = array('#type' => 'submit', '#value' => t('Log in'));
           $form['#action'] = url("user/reset/$uid/$timestamp/$hashed_pass/login");
@@ -131,7 +131,7 @@ function user_pass_reset($form, &$form_state, $uid, $timestamp, $hashed_pass, $a
         }
       }
       else {
-        drupal_set_message(t('You have tried to use a one-time login link which has either been used or is no longer valid. Please request a new one using the form below.'));
+        drupal_set_message(t('You have tried to use a one-time login link that has either been used or is no longer valid. Please request a new one using the form below.'));
         drupal_goto('user/password');
       }
     }