EZP-29902: Admin UI - Locale is not correctly set (#756)

* EZP-29902: Admin UI - Locale is not correctly set * fix for behat tests
ezsystems · Dec 17, 2018 · e57e53d · e57e53d
1 parent 0f4cfa0
commit e57e53d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/lib/Behat/PageElement/Fields/Date.php b/src/lib/Behat/PageElement/Fields/Date.php
@@ -52,8 +52,8 @@ public function getValue(): array
 
     public function verifyValueInItemView(array $values): void
     {
-        $expectedDateTime = date_format(date_create($values['value']), self::VIEW_DATE_FORMAT);
-        $actualDateTime = $this->context->findElement($this->fields['fieldContainer'])->getText();
+        $expectedDateTime = date_create($values['value']);
+        $actualDateTime = date_create($this->context->findElement($this->fields['fieldContainer'])->getText());
         Assert::assertEquals(
             $expectedDateTime,
             $actualDateTime,

diff --git a/src/lib/EventListener/RequestLocaleListener.php b/src/lib/EventListener/RequestLocaleListener.php
@@ -14,6 +14,7 @@
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class RequestLocaleListener implements EventSubscriberInterface
 {
@@ -23,16 +24,22 @@ class RequestLocaleListener implements EventSubscriberInterface
     /** @var array */
     private $availableTranslations;
 
+    /** @var \Symfony\Component\Translation\TranslatorInterface */
+    private $translator;
+
     /**
      * @param array $siteAccessGroups
      * @param array $availableTranslations
+     * @param \Symfony\Component\Translation\TranslatorInterface $translator
      */
     public function __construct(
         array $siteAccessGroups,
-        array $availableTranslations
+        array $availableTranslations,
+        TranslatorInterface $translator
     ) {
         $this->siteAccessGroups = $siteAccessGroups;
         $this->availableTranslations = $availableTranslations;
+        $this->translator = $translator;
     }
 
     /**
@@ -59,19 +66,20 @@ public function onKernelRequest(GetResponseEvent $event): void
         }
 
         $preferableLocales = $this->getPreferredLocales($request);
+        $locale = null;
 
-        $locale = false;
         foreach ($preferableLocales as $preferableLocale) {
-            if (in_array($preferableLocale, $this->availableTranslations)) {
+            if (\in_array($preferableLocale, $this->availableTranslations)) {
                 $locale = $preferableLocale;
                 break;
             }
         }
-
-        if (false !== $locale) {
-            $request->setLocale($locale);
-            $request->attributes->set('_locale', $locale);
-        }
+        $locale = $locale ?? reset($preferableLocales);
+        $request->setLocale($locale);
+        $request->attributes->set('_locale', $locale);
+        // Set of the current locale on the translator service is needed because RequestLocaleListener has lower
+        // priority than LocaleListener and messages are not translated on login, forgot and reset password pages.
+        $this->translator->setLocale($locale);
     }
 
     /**