PHRAS-4111: Default language in the configuration file not taken into…

… account on the homepage. (#4570) * taken account default langage * test
alchemy-fr · Jan 8, 2025 · c26da21 · c26da21
1 parent 13fc43a
commit c26da21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriber.php b/lib/Alchemy/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriber.php
@@ -64,13 +64,6 @@ public function addLocale(GetResponseEvent $event)
         if ($event->getRequest()->cookies->has('locale')
             && isset($this->app['locales.available'][$event->getRequest()->cookies->get('locale')])) {
             $event->getRequest()->setLocale($event->getRequest()->cookies->get('locale'));
-        } else {
-            foreach ($event->getRequest()->getLanguages() as $code) {
-                $data = preg_split('/[-_]/', $code);
-                if (in_array($data[0], array_keys($this->app['locales.available']), true)) {
-                    $event->getRequest()->setLocale($data[0]);
-                }
-            }
         }
 
         $this->locale = $this->app['locale'] = $event->getRequest()->getLocale();

diff --git a/tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriberTest.php b/tests/Alchemy/Tests/Phrasea/Core/Event/Subscriber/PhraseaLocaleSubscriberTest.php
@@ -48,7 +48,7 @@ public function testWithHeaders()
         $client = new Client($app);
         $client->request('GET', '/', [], [], ['HTTP_ACCEPT_LANGUAGE' => 'fr_FR,fr;q=0.9']);
 
-        $this->assertEquals('fr', $client->getResponse()->getContent());
+        $this->assertEquals('en', $client->getResponse()->getContent());
     }
 
     public function testWithHeadersUsingMinus()
@@ -58,7 +58,7 @@ public function testWithHeadersUsingMinus()
         $client = new Client($app);
         $client->request('GET', '/', [], [], ['HTTP_ACCEPT_LANGUAGE' => 'fr-FR,fr;q=0.9']);
 
-        $this->assertEquals('fr', $client->getResponse()->getContent());
+        $this->assertEquals('en', $client->getResponse()->getContent());
     }
 
     public function testCookieIsSet()
@@ -75,7 +75,7 @@ public function testCookieIsSet()
         }
 
         $this->assertNotNull($settedCookie);
-        $this->assertEquals('fr', $settedCookie->getValue());
+        $this->assertEquals('en', $settedCookie->getValue());
     }
 
     /**