host/julienmonnerie
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é 2022-12-19 14:56:05 +01:00
parent 0320235f6c
commit a8b68fb61b
378 changed files with 28466 additions and 28852 deletions
Download patch file Download diff file Expand all files Collapse all files

55
kirby/src/Cms/Language.php
View file

@ -212,6 +212,15 @@ class Language extends Model
$language = new static($props);
// trigger before hook
$kirby->trigger(
'language.create:before',
[
'input' => $props,
'language' => $language
]
);
// validate the new language
LanguageRules::create($language);
@ -222,7 +231,16 @@ class Language extends Model
}
// update the main languages collection in the app instance
App::instance()->languages(false)->append($language->code(), $language);
$kirby->languages(false)->append($language->code(), $language);
// trigger after hook
$kirby->trigger(
'language.create:after',
[
'input' => $props,
'language' => $language
]
);
return $language;
}
@ -242,6 +260,11 @@ class Language extends Model
$code = $this->code();
$isLast = $languages->count() === 1;
// trigger before hook
$kirby->trigger('language.delete:before', [
'language' => $this
]);
if (F::remove($this->root()) !== true) {
throw new Exception('The language could not be deleted');
}
@ -255,6 +278,11 @@ class Language extends Model
// get the original language collection and remove the current language
$kirby->languages(false)->remove($code);
// trigger after hook
$kirby->trigger('language.delete:after', [
'language' => $this
]);
return true;
}
@ -350,7 +378,7 @@ class Language extends Model
try {
return Data::read($file);
} catch (\Exception $e) {
} catch (\Exception) {
return [];
}
}
@ -365,9 +393,9 @@ class Language extends Model
{
if ($category !== null) {
return $this->locale[$category] ?? $this->locale[LC_ALL] ?? null;
} else {
return $this->locale;
}
return $this->locale;
}
/**
@ -456,7 +484,7 @@ class Language extends Model
{
try {
$existingData = Data::read($this->root());
} catch (Throwable $e) {
} catch (Throwable) {
$existingData = [];
}
@ -660,11 +688,15 @@ class Language extends Model
// validate the updated language
LanguageRules::update($updated);
// trigger before hook
$kirby->trigger('language.update:before', [
'language' => $this,
'input' => $props
]);
// convert the current default to a non-default language
if ($updated->isDefault() === true) {
if ($oldDefault = $kirby->defaultLanguage()) {
$oldDefault->clone(['default' => false])->save();
}
$kirby->defaultLanguage()?->clone(['default' => false])->save();
$code = $this->code();
$site = $kirby->site();
@ -689,6 +721,13 @@ class Language extends Model
// make sure the language is also updated in the Kirby language collection
App::instance()->languages(false)->set($language->code(), $language);
// trigger after hook
$kirby->trigger('language.update:after', [
'newLanguage' => $language,
'oldLanguage' => $this,
'input' => $props
]);
return $language;
}
}