From 448ec7e54e2a572bbd14db31954952a7bc5ee2c4 Mon Sep 17 00:00:00 2001 From: Bastian Allgeier Date: Thu, 11 Feb 2021 11:53:14 +0100 Subject: [PATCH] Upgrade to 3.5.3 --- kirby/composer.json | 2 +- kirby/composer.lock | 2 +- kirby/i18n/translations/fr.json | 2 +- kirby/i18n/translations/id.json | 2 +- kirby/src/Cms/AppTranslations.php | 13 ++++++++----- kirby/vendor/composer/InstalledVersions.php | 8 ++++---- kirby/vendor/composer/installed.php | 8 ++++---- 7 files changed, 20 insertions(+), 17 deletions(-) diff --git a/kirby/composer.json b/kirby/composer.json index df2cfbf..7b1457f 100755 --- a/kirby/composer.json +++ b/kirby/composer.json @@ -8,7 +8,7 @@ "core" ], "homepage": "https://getkirby.com", - "version": "3.5.2", + "version": "3.5.3", "license": "proprietary", "authors": [ { diff --git a/kirby/composer.lock b/kirby/composer.lock index 69f8d6b..c3303d4 100755 --- a/kirby/composer.lock +++ b/kirby/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a2cc11786cdce4585a09648e43822c48", + "content-hash": "d4fb0f3eb259aded337afda88d20e1b0", "packages": [ { "name": "claviska/simpleimage", diff --git a/kirby/i18n/translations/fr.json b/kirby/i18n/translations/fr.json index c54b887..bc77d21 100755 --- a/kirby/i18n/translations/fr.json +++ b/kirby/i18n/translations/fr.json @@ -232,7 +232,7 @@ "field.blocks.image.name": "Image", "field.blocks.image.placeholder": "Sélectionnez une image", "field.blocks.image.ratio": "Proportions", - "field.blocks.image.url": "Image URL", + "field.blocks.image.url": "URL de l'image", "field.blocks.list.name": "Liste", "field.blocks.markdown.name": "Markdown", "field.blocks.markdown.label": "Texte", diff --git a/kirby/i18n/translations/id.json b/kirby/i18n/translations/id.json index 32d3a47..8dae04c 100755 --- a/kirby/i18n/translations/id.json +++ b/kirby/i18n/translations/id.json @@ -232,7 +232,7 @@ "field.blocks.image.name": "Gambar", "field.blocks.image.placeholder": "Pilih gambar", "field.blocks.image.ratio": "Rasio", - "field.blocks.image.url": "Image URL", + "field.blocks.image.url": "URL Gambar", "field.blocks.list.name": "Daftar", "field.blocks.markdown.name": "Markdown", "field.blocks.markdown.label": "Teks", diff --git a/kirby/src/Cms/AppTranslations.php b/kirby/src/Cms/AppTranslations.php index 9413f03..4bfb916 100755 --- a/kirby/src/Cms/AppTranslations.php +++ b/kirby/src/Cms/AppTranslations.php @@ -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 ); } } diff --git a/kirby/vendor/composer/InstalledVersions.php b/kirby/vendor/composer/InstalledVersions.php index 40b5b0b..4a9be08 100755 --- a/kirby/vendor/composer/InstalledVersions.php +++ b/kirby/vendor/composer/InstalledVersions.php @@ -14,8 +14,8 @@ class InstalledVersions private static $installed = array ( 'root' => array ( - 'pretty_version' => '3.5.2', - 'version' => '3.5.2.0', + 'pretty_version' => '3.5.3', + 'version' => '3.5.3.0', 'aliases' => array ( ), @@ -44,8 +44,8 @@ private static $installed = array ( ), 'getkirby/cms' => array ( - 'pretty_version' => '3.5.2', - 'version' => '3.5.2.0', + 'pretty_version' => '3.5.3', + 'version' => '3.5.3.0', 'aliases' => array ( ), diff --git a/kirby/vendor/composer/installed.php b/kirby/vendor/composer/installed.php index cff0302..13b2521 100755 --- a/kirby/vendor/composer/installed.php +++ b/kirby/vendor/composer/installed.php @@ -1,8 +1,8 @@ array ( - 'pretty_version' => '3.5.2', - 'version' => '3.5.2.0', + 'pretty_version' => '3.5.3', + 'version' => '3.5.3.0', 'aliases' => array ( ), @@ -31,8 +31,8 @@ ), 'getkirby/cms' => array ( - 'pretty_version' => '3.5.2', - 'version' => '3.5.2.0', + 'pretty_version' => '3.5.3', + 'version' => '3.5.3.0', 'aliases' => array ( ),