Merge pull request #1949 from XWB/verb

Use verb rather than noun
FriendsOfSymfony · Sep 15, 2015 · 1b13cfd · 1b13cfd
2 parents 3b63b2e + ff1932d
commit 1b13cfd
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/EventListener/AuthenticationListener.php b/EventListener/AuthenticationListener.php
@@ -51,7 +51,7 @@ public function authenticate(FilterUserResponseEvent $event, $eventName = null,
         }
 
         try {
-            $this->loginManager->loginUser($this->firewallName, $event->getUser(), $event->getResponse());
+            $this->loginManager->logInUser($this->firewallName, $event->getUser(), $event->getResponse());
 
             $eventDispatcher->dispatch(FOSUserEvents::SECURITY_IMPLICIT_LOGIN, new UserEvent($event->getUser(), $event->getRequest()));
         } catch (AccountStatusException $ex) {

diff --git a/Resources/doc/command_line_tools.rst b/Resources/doc/command_line_tools.rst
@@ -51,7 +51,7 @@ An example is provided below:
     $ php app/console fos:user:create adminuser --super-admin
 
 If you specify the ``--inactive`` option, then the user that you create will no be
-able to login until he is activated.
+able to log in until he is activated.
 
 .. code-block:: bash
 

diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
@@ -440,7 +440,7 @@ You now can run the following command to create the model:
     To create SQL, run the command ``propel:build --insert-sql`` or use migration
     commands if you have an existing schema in your database.
 
-You now can login at ``http://app.com/app_dev.php/login``!
+You now can log in at ``http://app.com/app_dev.php/login``!
 
 Next Steps
 ~~~~~~~~~~

diff --git a/Resources/translations/FOSUserBundle.en.yml b/Resources/translations/FOSUserBundle.en.yml
@@ -17,7 +17,7 @@ security:
         username: Username
         password: Password
         remember_me: Remember me
-        submit: Login
+        submit: Log in
 
 # Profile
 profile:
@@ -77,8 +77,8 @@ resetting:
 
 # Global strings
 layout:
-    logout: Logout
-    login: Login
+    logout: Log out
+    login: Log in
     register: Register
     logged_in_as: Logged in as %username%
 

diff --git a/Security/LoginManager.php b/Security/LoginManager.php
@@ -50,7 +50,7 @@ public function __construct($tokenStorage, UserCheckerInterface $userChecker,
         $this->container = $container;
     }
 
-    final public function loginUser($firewallName, UserInterface $user, Response $response = null)
+    final public function logInUser($firewallName, UserInterface $user, Response $response = null)
     {
         $this->userChecker->checkPostAuth($user);
 

diff --git a/Security/LoginManagerInterface.php b/Security/LoginManagerInterface.php
@@ -23,5 +23,5 @@ interface LoginManagerInterface
      *
      * @return void
      */
-    public function loginUser($firewallName, UserInterface $user, Response $response = null);
+    public function logInUser($firewallName, UserInterface $user, Response $response = null);
 }