Commit21c1347

committed

Use Accept-Language header even if there are no enabled locales

1 parenteb81ec1 commit21c1347Copy full SHA for 21c1347

File tree

-2

lines changed

src/Symfony/Component/HttpKernel
- EventListener
  - LocaleListener.php
- Tests/EventListener
  - LocaleListenerTest.php

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private function setLocale(Request $request)`
`68`	`68`	`{`
`69`	`69`	`if ($locale =$request->attributes->get('_locale')) {`
`70`	`70`	`$request->setLocale($locale);`
`71`		`- }elseif ($this->useAcceptLanguageHeader &&$this->enabledLocales &&($preferredLanguage =$request->getPreferredLanguage($this->enabledLocales))) {`
	`71`	`+ }elseif ($this->useAcceptLanguageHeader && ($preferredLanguage =$request->getPreferredLanguage($this->enabledLocales))) {`
`72`	`72`	`$request->setLocale($preferredLanguage);`
`73`	`73`	`$request->attributes->set('_vary_by_language',true);`
`74`	`74`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public function testRequestNoLocaleFromAcceptLanguageHeader()`
`179`	`179`
`180`	`180`	`$listener->setDefaultLocale($event);`
`181`	`181`	`$listener->onKernelRequest($event);`
`182`		`-$this->assertEquals('de',$request->getLocale());`
	`182`	`+$this->assertEquals('fr_FR',$request->getLocale());`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`publicfunctiontestRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()`

Comments

(0)