host/xiaowang
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Composer packages

Browse source
This commit is contained in:
Paul Nicoué 2023-06-01 16:57:01 +02:00
parent 37fb61e6a7
commit fed629e646
32 changed files with 906 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

17
kirby/src/Cms/App.php
View file

@ -555,10 +555,8 @@ class App
/**
* Returns the default language object
*
* @return \Kirby\Cms\Language|null
*/
public function defaultLanguage()
public function defaultLanguage(): Language|null
{
return $this->defaultLanguage ??= $this->languages()->default();
}
@ -577,22 +575,21 @@ class App
/**
* Detect the preferred language from the visitor object
*
* @return \Kirby\Cms\Language
*/
public function detectedLanguage()
public function detectedLanguage(): Language|null
{
$languages = $this->languages();
$visitor = $this->visitor();
foreach ($visitor->acceptedLanguages() as $lang) {
if ($language = $languages->findBy('locale', $lang->locale(LC_ALL))) {
foreach ($visitor->acceptedLanguages() as $acceptedLang) {
$closure = fn ($language) => $language->locale(LC_ALL) === $acceptedLang->locale();
if ($language = $languages->filter($closure)?->first()) {
return $language;
}
}
foreach ($visitor->acceptedLanguages() as $lang) {
if ($language = $languages->findBy('code', $lang->code())) {
foreach ($visitor->acceptedLanguages() as $acceptedLang) {
if ($language = $languages->findBy('code', $acceptedLang->code())) {
return $language;
}
}