Skip to content

Commit 9aa57a4

Browse files
MatTheCatfabpot
authored andcommitted
[HttpKernel] Use Accept-Language header even if there are no enabled locales
1 parent 94bd1cd commit 9aa57a4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

EventListener/LocaleListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private function setLocale(Request $request)
6868
{
6969
if ($locale = $request->attributes->get('_locale')) {
7070
$request->setLocale($locale);
71-
} elseif ($this->useAcceptLanguageHeader && $this->enabledLocales && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
71+
} elseif ($this->useAcceptLanguageHeader && ($preferredLanguage = $request->getPreferredLanguage($this->enabledLocales))) {
7272
$request->setLocale($preferredLanguage);
7373
$request->attributes->set('_vary_by_language', true);
7474
}

Tests/EventListener/LocaleListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public function testRequestNoLocaleFromAcceptLanguageHeader()
179179

180180
$listener->setDefaultLocale($event);
181181
$listener->onKernelRequest($event);
182-
$this->assertEquals('de', $request->getLocale());
182+
$this->assertEquals('fr_FR', $request->getLocale());
183183
}
184184

185185
public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()

0 commit comments

Comments
 (0)