8000 [HttpKernel] Fix default locale is ignored when `set_locale_from_accept_language` is used by jkobus · Pull Request #53195 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content
8000

[HttpKernel] Fix default locale is ignored when set_locale_from_accept_language is used #53195

New issue 8000

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 29, 2023
Merged

[HttpKernel] Fix default locale is ignored when set_locale_from_accept_language is used #53195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down
22 changes: 22 additions & 0 deletions src/Symfony/Component/HttpKernel/Tests/EventListener/LocaleListenerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('/');
Expand Down
0