genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve locale handling

Browse source
This commit is contained in:
Pierre Rudloff 2017-05-30 23:30:21 +02:00
parent b4dd0aeb29
commit 0f80cbd333
7 changed files with 118 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
classes/LocaleMiddleware.php
View file

@ -34,7 +34,7 @@ class LocaleMiddleware
*/
public function testLocale(array $proposedLocale)
{
foreach ($this->locale->getSupportedLocales() as $locale => $name) {
foreach ($this->locale->getSupportedLocales() as $locale) {
$parsedLocale = AcceptLanguage::parse($locale);
if (isset($proposedLocale['language'])
&& $parsedLocale[1]['language'] == $proposedLocale['language']
@ -59,9 +59,13 @@ class LocaleMiddleware
$headers = $request->getHeader('Accept-Language');
$curLocale = $this->locale->getLocale();
if (!isset($curLocale)) {
$this->locale->setLocale(
AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0])
);
if (isset($headers[0])) {
$this->locale->setLocale(
AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0])
);
} else {
$this->locale->setLocale('en_US');
}
}
return $next($request, $response);