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

2
kirby/composer.json
View File

@@ -8,7 +8,7 @@
"core" "core"
], ],
"homepage": "https://getkirby.com", "homepage": "https://getkirby.com",
"version": "3.5.2", "version": "3.5.3",
"license": "proprietary", "license": "proprietary",
"authors": [ "authors": [
{ {

2
kirby/composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a2cc11786cdce4585a09648e43822c48", "content-hash": "d4fb0f3eb259aded337afda88d20e1b0",
"packages": [ "packages": [
{ {
"name": "claviska/simpleimage", "name": "claviska/simpleimage",

2
kirby/i18n/translations/fr.json
View File

@@ -232,7 +232,7 @@
"field.blocks.image.name": "Image", "field.blocks.image.name": "Image",
"field.blocks.image.placeholder": "Sélectionnez une image", "field.blocks.image.placeholder": "Sélectionnez une image",
"field.blocks.image.ratio": "Proportions", "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.list.name": "Liste",
"field.blocks.markdown.name": "Markdown", "field.blocks.markdown.name": "Markdown",
"field.blocks.markdown.label": "Texte", "field.blocks.markdown.label": "Texte",

2
kirby/i18n/translations/id.json
View File

@@ -232,7 +232,7 @@
"field.blocks.image.name": "Gambar", "field.blocks.image.name": "Gambar",
"field.blocks.image.placeholder": "Pilih gambar", "field.blocks.image.placeholder": "Pilih gambar",
"field.blocks.image.ratio": "Rasio", "field.blocks.image.ratio": "Rasio",
"field.blocks.image.url": "Image URL", "field.blocks.image.url": "URL Gambar",
"field.blocks.list.name": "Daftar", "field.blocks.list.name": "Daftar",
"field.blocks.markdown.name": "Markdown", "field.blocks.markdown.name": "Markdown",
"field.blocks.markdown.label": "Teks", "field.blocks.markdown.label": "Teks",

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

@@ -213,11 +213,14 @@ trait AppTranslations
// injects languages translations // injects languages translations
if ($languages = $this->languages()) { if ($languages = $this->languages()) {
foreach ($languages as $language) { foreach ($languages as $language) {
// merges language translations with extension translations $languageCode = $language->code();
if ($language->translations()) { $languageTranslations = $language->translations();
$translations[$language->code()] = array_merge(
$translations[$language->code()], // merges language translations with extensions translations
$language->translations() if (empty($languageTranslations) === false) {
$translations[$languageCode] = array_merge(
$translations[$languageCode] ?? [],
$languageTranslations
); );
} }
} }

8
kirby/vendor/composer/InstalledVersions.php vendored
View File

@@ -14,8 +14,8 @@ class InstalledVersions
private static $installed = array ( private static $installed = array (
'root' => 'root' =>
array ( array (
'pretty_version' => '3.5.2', 'pretty_version' => '3.5.3',
'version' => '3.5.2.0', 'version' => '3.5.3.0',
'aliases' => 'aliases' =>
array ( array (
), ),
@@ -44,8 +44,8 @@ private static $installed = array (
), ),
'getkirby/cms' => 'getkirby/cms' =>
array ( array (
'pretty_version' => '3.5.2', 'pretty_version' => '3.5.3',
'version' => '3.5.2.0', 'version' => '3.5.3.0',
'aliases' => 'aliases' =>
array ( array (
), ),

8
kirby/vendor/composer/installed.php vendored
View File

@@ -1,8 +1,8 @@
<?php return array ( <?php return array (
'root' => 'root' =>
array ( array (
'pretty_version' => '3.5.2', 'pretty_version' => '3.5.3',
'version' => '3.5.2.0', 'version' => '3.5.3.0',
'aliases' => 'aliases' =>
array ( array (
), ),
@@ -31,8 +31,8 @@
), ),
'getkirby/cms' => 'getkirby/cms' =>
array ( array (
'pretty_version' => '3.5.2', 'pretty_version' => '3.5.3',
'version' => '3.5.2.0', 'version' => '3.5.3.0',
'aliases' => 'aliases' =>
array ( array (
), ),