diff --git a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
index f19e13649e988..2c09e22bda7ac 100644
--- a/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
+++ b/src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
@@ -68,8 +68,10 @@ private function setLocale(Request $request)
{
if ($locale = $request->attributes->get('_locale')) {
$request->setLocale($locale);
- } elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
- $request->setLocale($preferredLanguage);
+ } elseif ($this->useAcceptLanguageHeader && $this->enabledLocales) {
+ if ($request->getLanguages() && $preferredLanguage = $request->getPreferredLanguage($this->enabledLocales)) {
+ $request->setLocale($preferredLanguage);
+ }
$request->attributes->set('_vary_by_language', true);
}
}
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
index 04d951747407d..e22950ddd913a 100644
--- a/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
+++ b/src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
@@ -130,6 +130,28 @@ public function testRequestPreferredLocaleFromAcceptLanguageHeader()
$this->assertEquals('fr', $request->getLocale());
}
+ public function testRequestDefaultLocaleIfNoAcceptLanguageHeaderIsPresent()
+ {
+ $request = new Request();
+ $listener = new LocaleListener($this->requestStack, 'de', null, true, ['lt', 'de']);
+ $event = $this->getEvent($request);
+
+ $listener->setDefaultLocale($event);
+ $listener->onKernelRequest($event);
+ $this->assertEquals('de', $request->getLocale());
+ }
+
+ public function testRequestVaryByLanguageAttributeIsSetIfUsingAcceptLanguageHeader()
+ {
+ $request = new Request();
+ $listener = new LocaleListener($this->requestStack, 'de', null, true, ['lt', 'de']);
+ $event = $this->getEvent($request);
+
+ $listener->setDefaultLocale($event);
+ $listener->onKernelRequest($event);
+ $this->assertTrue($request->attributes->get('_vary_by_language'));
+ }
+
public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
{
$request = Request::create('/');
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy