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

Fix LocaleMiddleware tests

Browse source
This commit is contained in:
Pierre Rudloff 2017-05-30 23:41:26 +02:00
parent 0f80cbd333
commit 433a580d64
2 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
classes/LocaleMiddleware.php
View file

@ -40,7 +40,7 @@ class LocaleMiddleware
&& $parsedLocale[1]['language'] == $proposedLocale['language']
&& $parsedLocale[1]['region'] == $proposedLocale['region']
) {
return $proposedLocale['language'].'_'.$proposedLocale['region'];
return new Locale($proposedLocale['language'].'_'.$proposedLocale['region']);
}
}
}
@ -61,10 +61,10 @@ class LocaleMiddleware
if (!isset($curLocale)) {
if (isset($headers[0])) {
$this->locale->setLocale(
AcceptLanguage::detect([$this, 'testLocale'], 'en_US', $headers[0])
AcceptLanguage::detect([$this, 'testLocale'], new Locale('en_US'), $headers[0])
);
} else {
$this->locale->setLocale('en_US');
$this->locale->setLocale(new Locale('en_US'));
}
}