Skip to content

Commit fc981cf

Browse files
Merge branch '5.4' into 6.3
* 5.4: [FrameworkBundle] Update docblock AbstractController [HttpFoundation][FrameworkBundle] Fix default locale is ignored when set_locale_from_accept_language is used add missing translations [Validator] updated Lithuanian translation [Validator] fix some non-sense Lithuanian translations [Validator] updated Slovenian translation [Validator] updated Finnish translation [Validator] Add `Charset` french translation [Tests] Streamline CompiledUrlGenerator tests [Serializer] Skip uninitialized properties with deep_object_to_populate fix Constraints\Email::ERROR_NAMES
2 parents 9f69174 + bd55eb8 commit fc981cf

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

EventListener/LocaleListener.php

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

Tests/EventListener/LocaleListenerTest.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,28 @@ public function testRequestPreferredLocaleFromAcceptLanguageHeader()
130130
$this->assertEquals('fr', $request->getLocale());
131131
}
132132

133+
public function testRequestDefaultLocaleIfNoAcceptLanguageHeaderIsPresent()
134+
{
135+
$request = new Request();
136+
$listener = new LocaleListener($this->requestStack, 'de', null, true, ['lt', 'de']);
137+
$event = $this->getEvent($request);
138+
139+
$listener->setDefaultLocale($event);
140+
$listener->onKernelRequest($event);
141+
$this->assertEquals('de', $request->getLocale());
142+
}
143+
144+
public function testRequestVaryByLanguageAttributeIsSetIfUsingAcceptLanguageHeader()
145+
{
146+
$request = new Request();
147+
$listener = new LocaleListener($this->requestStack, 'de', null, true, ['lt', 'de']);
148+
$event = $this->getEvent($request);
149+
150+
$listener->setDefaultLocale($event);
151+
$listener->onKernelRequest($event);
152+
$this->assertTrue($request->attributes->get('_vary_by_language'));
153+
}
154+
133155
public function testRequestSecondPreferredLocaleFromAcceptLanguageHeader()
134156
{
135157
$request = Request::create('/');

0 commit comments

Comments
 (0)