Upgrade to 3.5.3
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
"core"
|
||||
],
|
||||
"homepage": "https://getkirby.com",
|
||||
"version": "3.5.2",
|
||||
"version": "3.5.3",
|
||||
"license": "proprietary",
|
||||
"authors": [
|
||||
{
|
||||
|
2
kirby/composer.lock
generated
2
kirby/composer.lock
generated
@@ -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",
|
||||
|
@@ -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",
|
||||
|
@@ -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",
|
||||
|
@@ -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
|
||||
);
|
||||
}
|
||||
}
|
||||
|
8
kirby/vendor/composer/InstalledVersions.php
vendored
8
kirby/vendor/composer/InstalledVersions.php
vendored
@@ -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 (
|
||||
),
|
||||
|
8
kirby/vendor/composer/installed.php
vendored
8
kirby/vendor/composer/installed.php
vendored
@@ -1,8 +1,8 @@
|
||||
<?php return 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 (
|
||||
),
|
||||
@@ -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 (
|
||||
),
|
||||
|
Reference in New Issue
Block a user