interkollektives/lichterei-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Upgrade to 3.5.2

Browse Source
This commit is contained in:
Bastian Allgeier
2021-02-09 16:55:18 +01:00
parent 99c36fa137
commit b507926ad1
53 changed files with 350 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kirby/src/Cms/AppTranslations.php
View File

@@ -188,6 +188,11 @@ trait AppTranslations
// get injected translation data from plugins etc.
$inject = $this->extensions['translations'][$locale] ?? [];
// inject current language translations
if ($language = $this->language($locale)) {
$inject = array_merge($inject, $language->translations());
}
// load from disk instead
return Translation::load($locale, $this->root('i18n:translations') . '/' . $locale . '.json', $inject);
}
@@ -203,6 +208,23 @@ trait AppTranslations
return $this->translations;
}
return Translations::load($this->root('i18n:translations'), $this->extensions['translations'] ?? []);
$translations = $this->extensions['translations'] ?? [];
// injects languages translations
if ($languages = $this->languages()) {
foreach ($languages as $language) {
// merges language translations with extension translations
if ($language->translations()) {
$translations[$language->code()] = array_merge(
$translations[$language->code()],
$language->translations()
);
}
}
}
$this->translations = Translations::load($this->root('i18n:translations'), $translations);
return $this->translations;
}
}