some way towards translations

Author: a6software

composer.lock

@@ -49,7 +49,14 @@ public function requestResetAction(Request $request)
         }
 
         if (null === $user) {
-            return new JsonResponse(['Invalid username' => $username], Response::HTTP_FORBIDDEN);
+            return new JsonResponse(
+                $this->get('translator')->trans(
+                    'resetting.request.invalid_username',
+                    [ '%username%' => $username ],
+                    'FOSUserBundle'
+                ),
+                Response::HTTP_FORBIDDEN
+            );
         }
 
         $event = new GetResponseUserEvent($user, $request);
@@ -60,9 +67,10 @@ public function requestResetAction(Request $request)
         }
 
         if ($user->isPasswordRequestNonExpired($this->container->getParameter('fos_user.resetting.token_ttl'))) {
-            return new JsonResponse(sprintf('Password reset request is already in progress. Please check your email: %s',
-                $this->getObfuscatedEmail($user)
-            ), Response::HTTP_FORBIDDEN);
+            return new JsonResponse(
+                $this->get('translator')->trans('resetting.password_already_requested', [], 'FOSUserBundle'),
+                Response::HTTP_FORBIDDEN
+            );
         }
 
         if (null === $user->getConfirmationToken()) {
@@ -92,9 +100,14 @@ public function requestResetAction(Request $request)
             return $event->getResponse();
         }
 
-        return new JsonResponse(sprintf('Password reset request accepted, please check your email: %s',
-            $this->getObfuscatedEmail($user)
-        ));
+        return new JsonResponse(
+            $this->get('translator')->trans(
+                'resetting.check_email',
+                [ '%email%' => $this->getObfuscatedEmail($user) ],
+                'FOSUserBundle'
+            ),
+            Response::HTTP_OK
+        );
     }
 
     /**
@@ -120,6 +133,7 @@ public function confirmResetAction(Request $request)
 
         if (null === $user) {
             return new JsonResponse(
+                // no translation provided for this in \FOS\UserBundle\Controller\ResettingController
                 sprintf('The user with "confirmation token" does not exist for value "%s"', $token),
                 Response::HTTP_BAD_REQUEST
             );
@@ -149,13 +163,19 @@ public function confirmResetAction(Request $request)
         $userManager->updateUser($user);
 
         if (null === $response = $event->getResponse()) {
-            return new JsonResponse('Successfully updated password', Response::HTTP_OK);
+            return new JsonResponse(
+                $this->get('translator')->trans('resetting.flash.success', [], 'FOSUserBundle'),
+                Response::HTTP_OK
+            );
         }
 
         // unsure if this is now needed / will work the same
         $dispatcher->dispatch(FOSUserEvents::RESETTING_RESET_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
 
-        return new JsonResponse('Successfully updated password', Response::HTTP_OK);
+        return new JsonResponse(
+            $this->get('translator')->trans('resetting.flash.success', [], 'FOSUserBundle'),
+            Response::HTTP_OK
+        );
     }
 
     /**
@@ -224,11 +244,17 @@ public function changeAction(Request $request, UserInterface $user)
         $userManager->updateUser($user);
 
         if (null === $response = $event->getResponse()) {
-            return new JsonResponse('Successfully updated password', Response::HTTP_OK);
+            return new JsonResponse(
+                $this->get('translator')->trans('change_password.flash.success', [], 'FOSUserBundle'),
+                Response::HTTP_OK
+            );
         }
 
         $dispatcher->dispatch(FOSUserEvents::CHANGE_PASSWORD_COMPLETED, new FilterUserResponseEvent($user, $request, $response));
 
-        return new JsonResponse('Successfully updated password', Response::HTTP_OK);
+        return new JsonResponse(
+            $this->get('translator')->trans('change_password.flash.success', [], 'FOSUserBundle'),
+            Response::HTTP_OK
+        );
     }
 }

src/AppBundle/Controller/RestPasswordManagementController.php

@@ -291,7 +291,7 @@ public function theResponseCodeShouldBe($code)
      *
      * @param string $text
      *
-     * @Then /^(?:the )?response should contain "([^"]*)"$/
+     * @Then /^(?:the )?response should contain "((?:[^"]|\\")*)"$/
      */
     public function theResponseShouldContain($text)
     {

src/AppBundle/Features/Context/RestApiContext.php

@@ -53,7 +53,7 @@ Feature: Handle password changing via the RESTful API
       }
       """
     Then the response code should be 200
-     And the response should contain "Successfully updated password"
+     And the response should contain "The password has been changed"
 
   Scenario: Cannot change password with bad current password
     When I am successfully logged in with username: "peter", and password: "testpass"
@@ -68,7 +68,7 @@ Feature: Handle password changing via the RESTful API
       }
       """
     Then the response code should be 400
-    And the response should contain "This value should be the user's current password."
+     And the response should contain "This value should be the user's current password."
 
   Scenario: Cannot change password with mismatched new password
     When I am successfully logged in with username: "peter", and password: "testpass"

src/AppBundle/Features/password_change.feature

@@ -16,31 +16,30 @@ Feature: Handle password changing via the RESTful API
   ############################
   ## Password Reset Request ##
   ############################
-
   Scenario: Cannot request a password reset for an invalid username
     When I send a "POST" request to "/password/reset/request" with body:
       """
       { "username": "davey" }
       """
     Then the response code should be 403
-     And the response should contain "Invalid username"
+     And the response should contain "The username or email address \u0022davey\u0022 does not exist"
+     # silly
 
-  @this
   Scenario: Can request a password reset for a valid username
     When I send a "POST" request to "/password/reset/request" with body:
       """
       { "username": "peter" }
       """
     Then the response code should be 200
-     And the response should contain "Password reset request accepted, please check your email"
+     And the response should contain "An email has been sent to ...@test.com. It contains a link you must click to reset your password."
 
   Scenario: Cannot request another password reset for an account already requesting, but not yet actioning the reset request
      When I send a "POST" request to "/password/reset/request" with body:
       """
       { "username": "john" }
       """
     Then the response code should be 403
-     And the response should contain "Password reset request is already in progress. Please check your email"
+     And the response should contain "The password for this user has already been requested within the last 24 hours."
 
 
 
@@ -102,7 +101,7 @@ Feature: Handle password changing via the RESTful API
       }
       """
     Then the response code should be 200
-     And the response should contain "Successfully updated password"
+     And the response should contain "The password has been reset successfully"
      And I send a "POST" request to "/login" with body:
       """
       {

src/AppBundle/Features/password_reset.feature

@@ -45,7 +45,6 @@ Feature: Manage User profile data via the RESTful API
       """
     Then the response code should be 400
 
-    @fail
   Scenario: Can replace their own profile
     When I send a "PUT" request to "/profile/1" with body:
       """