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

Upgrade to 3.5.3

Browse Source
This commit is contained in:
Bastian Allgeier
2021-02-11 11:53:14 +01:00
parent b507926ad1
commit 448ec7e54e
7 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -213,11 +213,14 @@ trait AppTranslations
// 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()
$languageCode = $language->code();
$languageTranslations = $language->translations();
// merges language translations with extensions translations
if (empty($languageTranslations) === false) {
$translations[$languageCode] = array_merge(
$translations[$languageCode] ?? [],
$languageTranslations
);
}
}