Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf76a3b0

Browse files
committed
bug#47675 [HttpKernel] Use Accept-Language header even if there are no enabled locales (MatTheCat)
This PR was squashed before being merged into the 6.1 branch.Discussion----------[HttpKernel] Use Accept-Language header even if there are no enabled locales| Q | A| ------------- | ---| Branch? | 6.1| Bug fix? | yes| New feature? | no| Deprecations? | no| Tickets |Fix#47377| License | MIT| Doc PR | N/ACommits-------d97d51c [HttpKernel] Use Accept-Language header even if there are no enabled locales
2 parents093ebec +d97d51c commitf76a3b0

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

‎src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ 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))) {
72-
$request->setLocale($preferredLanguage);
71+
}elseif ($this->useAcceptLanguageHeader) {
72+
if ($preferredLanguage =$request->getPreferredLanguage($this->enabledLocales)) {
73+
$request->setLocale($preferredLanguage);
74+
}
7375
$request->attributes->set('_vary_by_language',true);
7476
}
7577
}

‎src/Symfony/Component/HttpKernel/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
publicfunctiontestRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp