Merge pull request #3148 from getkirby/release/3.5.2

3.5.2

.github/CONTRIBUTING.md

@@ -31,7 +31,7 @@ Fix code style issues with [PHP CS](https://github.com/FriendsOfPHP/PHP-CS-Fixer
 
 ## Translations
 
-We are really happy about any help with our translations. Please, do not translate directly in the JSON files though. We use a service called Transifex to handle [all translations for the Panel](https://www.transifex.com/getkirby/panel/). Create an account there and send us a request to join our translator group. Please, also send us an email at <[email protected]>. Unfortunately, we don't get notified properly about new translator requests and often miss them.
+We are really happy about any help with our translations. Please, do not translate directly in the JSON files though. We use a service called Transifex to handle [all translations for the Panel](https://translation.getkirby.com/). Create an account there and send us a request to join our translator group. Please, also send us an email at <[email protected]>. Unfortunately, we don't get notified properly about new translator requests and often miss them.
 
 ## Features
 

.github/ISSUE_TEMPLATE/config.yml

@@ -5,3 +5,6 @@ contact_links:
   - name: Question
     url: https://forum.getkirby.com
     about: For support matters, head over to our forum.
+  - name: Translation
+    url: https://translation.getkirby.com
+    about: Contribute to language translations for the Panel

.github/README.md

@@ -1,10 +1,10 @@
 [<img src="http://getkirby.com/assets/images/github/kirby.jpg" width="300">](https://getkirby.com)   
 
-[![Release](https://flat.badgen.net/github/release/getkirby/kirby/stable?color=yellow)](https://github.com/getkirby/kirby/releases/latest)
-[![CI Status](https://flat.badgen.net/github/checks/getkirby/kirby/master)](https://github.com/getkirby/kirby/actions?query=workflow%3ACI)
-[![Coverage Status](https://flat.badgen.net/codecov/c/gh/getkirby/kirby/master?label=coverage)](https://codecov.io/gh/getkirby/kirby)
-[![Downloads](https://flat.badgen.net/packagist/dt/getkirby/cms?color=red)](https://github.com/getkirby/kirby/releases/latest)
-[![Twitter](https://flat.badgen.net/twitter/follow/getkirby?color=cyan)](https://twitter.com/getkirby)
+[![Release](https://badgen.net/github/release/getkirby/kirby/stable?color=yellow)](https://github.com/getkirby/kirby/releases/latest)
+[![CI Status](https://github.com/getkirby/kirby/workflows/CI/badge.svg)](https://github.com/getkirby/kirby/actions?query=workflow%3ACI)
+[![Coverage Status](https://badgen.net/codecov/c/gh/getkirby/kirby/master?label=coverage)](https://codecov.io/gh/getkirby/kirby)
+[![Downloads](https://badgen.net/packagist/dt/getkirby/cms?color=red)](https://github.com/getkirby/kirby/releases/latest)
+[![Twitter](https://badgen.net/twitter/follow/getkirby?color=cyan)](https://twitter.com/getkirby)
 
 **Kirby: the CMS that adapts to any project, loved by developers and editors alike.**  
 With Kirby, you build your own ideal interface. Combine forms, galleries, articles, spreadsheets and more into an amazing editing experience. You can learn more about Kirby at [getkirby.com](https://getkirby.com).  

.github/workflows/ci.yml

@@ -22,6 +22,8 @@ jobs:
     steps:
       - name: Checkout Kirby
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
 
       - name: Install memcached
         uses: niden/actions-memcached@v7
@@ -66,6 +68,7 @@ jobs:
       - name: Upload coverage results to Codecov
         uses: codecov/codecov-action@v1
         with:
+          fail_ci_if_error: true
           file: ${{ github.workspace }}/clover.xml
           flags: backend
           env_vars: PHP
@@ -268,7 +271,8 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      php: "8.0"
+      # TODO: update to PHP 8.0 when PHP-CS-Fixer fully supports it
+      php: "7.4"
 
     steps:
       - name: Checkout Kirby
@@ -321,8 +325,6 @@ jobs:
 
       - name: Check for PHP coding style violations
         if: always() && steps.finishPrepare.outcome == 'success'
-        env:
-          PHP_CS_FIXER_IGNORE_ENV: 1
         # Use the --dry-run flag in push builds to get a failed CI status
         run: >
           php-cs-fixer fix --diff --diff-format=udiff

composer.json

@@ -8,7 +8,7 @@
     "core"
   ],
   "homepage": "https://getkirby.com",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "license": "proprietary",
   "authors": [
     {
@@ -47,7 +47,7 @@
     ]
   },
   "scripts": {
-    "post-update-cmd": "curl -o cacert.pem https://curl.haxx.se/ca/cacert.pem",
+    "post-update-cmd": "curl -o cacert.pem https://curl.se/ca/cacert.pem",
     "analyze": [
       "@analyze:composer",
       "@analyze:psalm",

config/blocks/image/image.yml

@@ -21,7 +21,7 @@ fields:
     when:
       location: kirby
   src:
-    label: Image URL
+    label: field.blocks.image.url
     type: url
     when:
       location: web

config/sections/files.php

@@ -30,8 +30,8 @@
         /**
          * Optional info text setup. Info text is shown on the right (lists) or below (cards) the filename.
          */
-        'info' => function (string $info = null) {
-            return $info;
+        'info' => function ($info = null) {
+            return I18n::translate($info, $info);
         },
         /**
          * The size option controls the size of cards. By default cards are auto-sized and the cards grid will always fill the full width. With a size you can disable auto-sizing. Available sizes: `tiny`, `small`, `medium`, `large`, `huge`
@@ -60,8 +60,8 @@
         /**
          * Setup for the main text in the list or cards. By default this will display the filename.
          */
-        'text' => function (string $text = '{{ file.filename }}') {
-            return $text;
+        'text' => function ($text = '{{ file.filename }}') {
+            return I18n::translate($text, $text);
         }
     ],
     'computed' => [
@@ -123,7 +123,7 @@
                     'id'       => $file->id(),
                     'icon'     => $file->panelIcon($image),
                     'image'    => $image,
-                    'info'     => $file->toString($this->info ?? false),
+                    'info'     => $file->toString($this->info),
                     'link'     => $file->panelUrl(true),
                     'mime'     => $file->mime(),
                     'parent'   => $file->parent()->panelPath(),

config/sections/pages.php

@@ -38,8 +38,8 @@
         /**
          * Optional info text setup. Info text is shown on the right (lists) or below (cards) the page title.
          */
-        'info' => function (string $info = null) {
-            return $info;
+        'info' => function ($info = null) {
+            return I18n::translate($info, $info);
         },
         /**
          * The size option controls the size of cards. By default cards are auto-sized and the cards grid will always fill the full width. With a size you can disable auto-sizing. Available sizes: `tiny`, `small`, `medium`, `large`, `huge`
@@ -82,8 +82,8 @@
         /**
          * Setup for the main text in the list or cards. By default this will display the page title.
          */
-        'text' => function (string $text = '{{ page.title }}') {
-            return $text;
+        'text' => function ($text = '{{ page.title }}') {
+            return I18n::translate($text, $text);
         }
     ],
     'computed' => [
@@ -157,7 +157,7 @@
                     'id'          => $item->id(),
                     'dragText'    => $item->dragText(),
                     'text'        => $item->toString($this->text),
-                    'info'        => $item->toString($this->info ?? false),
+                    'info'        => $item->toString($this->info),
                     'parent'      => $item->parentId(),
                     'icon'        => $item->panelIcon($image),
                     'image'       => $image,

i18n/translations/bg.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Изображение",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/ca.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Imatge",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/cs.json

@@ -67,7 +67,7 @@
   "error.file.changeName.permission": "Nemáte povoleno změnit jméno souboru \"{filename}\"",
   "error.file.duplicate": "Soubor s názvem \"{filename}\" již existuje",
   "error.file.extension.forbidden": "Přípona souboru \"{extension}\" není povolena",
-  "error.file.extension.invalid": "Invalid extension: {extension}",
+  "error.file.extension.invalid": "Neplatná přípona souboru: {extension}",
   "error.file.extension.missing": "Nem\u016f\u017eete nahr\u00e1t soubor bez p\u0159\u00edpony",
   "error.file.maxheight": "Výška obrázku nesmí přesáhnout {height} pixelů",
   "error.file.maxsize": "Soubor je příliš velký",
@@ -83,7 +83,7 @@
   "error.file.notFound": "Soubor se nepoda\u0159ilo nal\u00e9zt",
   "error.file.orientation": "Orientace obrázku másí být \"{orientation}\"",
   "error.file.type.forbidden": "Nemáte povoleno nahrávat soubory typu {type} ",
-  "error.file.type.invalid": "Invalid file type: {type}",
+  "error.file.type.invalid": "Neplatný typ souboru: {type}",
   "error.file.undefined": "Soubor se nepoda\u0159ilo nal\u00e9zt",
 
   "error.form.incomplete": "Prosím opravte všechny chyby ve formuláři",
@@ -93,8 +93,8 @@
   "error.language.duplicate": "Jazyk již existuje",
   "error.language.name": "Zadejte prosím platné jméno jazyka",
 
-  "error.layout.validation.block": "There's an error in block {blockIndex} in layout {layoutIndex}",
-  "error.layout.validation.settings": "There's an error in layout {index} settings",
+  "error.layout.validation.block": "Chyba v bloku {blockIndex} v rozvržení {layoutIndex}",
+  "error.layout.validation.settings": "Chyba v nastavení rozvržení {index}",
 
   "error.license.format": "Zadejte prosím platné licenční číslo",
   "error.license.email": "Zadejte prosím platnou emailovou adresu",
@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Obrázek",
   "field.blocks.image.placeholder": "Vyberte obrázek",
   "field.blocks.image.ratio": "Poměr stran",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "Seznam",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",
@@ -464,7 +465,7 @@
   "toolbar.button.file.select": "Vyberte soubor",
   "toolbar.button.file.upload": "Nahrajte soubor",
   "toolbar.button.link": "Odkaz",
-  "toolbar.button.ol": "Řazený seznam",
+  "toolbar.button.ol": "Číslovaný seznam",
   "toolbar.button.ul": "Odrážkový seznam",
 
   "translation.author": "Kirby tým",

i18n/translations/da.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Billede",
   "field.blocks.image.placeholder": "Vælg et billede",
   "field.blocks.image.ratio": "Størrelsesforhold",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "Liste",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Tekst",

i18n/translations/de.json

@@ -93,7 +93,7 @@
   "error.language.duplicate": "Die Sprache besteht bereits",
   "error.language.name": "Bitte gib einen gültigen Namen für die Sprache an",
 
-  "error.layout.validation.block": "Fehler in Block {blockindex} in Layout {layoutIndex}",
+  "error.layout.validation.block": "Fehler in Block {blockIndex} in Layout {layoutIndex}",
   "error.layout.validation.settings": "Fehler in den Einstellungen von Layout {index}",
 
   "error.license.format": "Bitte gib einen gültigen Lizenzschlüssel ein",
@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Bild",
   "field.blocks.image.placeholder": "Bild auswählen",
   "field.blocks.image.ratio": "Seitenverhältnis",
+  "field.blocks.image.url": "Bild URL",
   "field.blocks.list.name": "Liste",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/el.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Εικόνα",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/en.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Image",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/es_419.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Imágen",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/es_ES.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Imágen",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/fa.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "تصویر",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/fi.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Kuva",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/fr.json

@@ -232,6 +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.list.name": "Liste",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Texte",

i18n/translations/hu.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Kép",
   "field.blocks.image.placeholder": "Select an image",
   "field.blocks.image.ratio": "Ratio",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "List",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Text",

i18n/translations/id.json

@@ -67,7 +67,7 @@
   "error.file.changeName.permission": "Anda tidak diizinkan mengubah nama berkas \"{filename}\"",
   "error.file.duplicate": "Berkas dengan nama \"{filename}\" sudah ada",
   "error.file.extension.forbidden": "Ekstensi \"{extension}\" tidak diizinkan",
-  "error.file.extension.invalid": "Invalid extension: {extension}",
+  "error.file.extension.invalid": "Ekstensi tidak valid: {extension}",
   "error.file.extension.missing": "Berkas \"{filename}\" harus memiliki ekstensi",
   "error.file.maxheight": "Tinggi gambar tidak boleh melebihi {height} piksel",
   "error.file.maxsize": "Berkas terlalu besar",
@@ -83,7 +83,7 @@
   "error.file.notFound": "Berkas \"{filename}\" tidak dapat ditemukan",
   "error.file.orientation": "Orientasi gambar harus \"{orientation}\"",
   "error.file.type.forbidden": "Anda tidak diizinkan mengunggah berkas dengan tipe {type}",
-  "error.file.type.invalid": "Invalid file type: {type}",
+  "error.file.type.invalid": "Tipe berkas tidak valid: {type}",
   "error.file.undefined": "Berkas tidak dapat ditemukan",
 
   "error.form.incomplete": "Pastikan semua bidang telah diisi dengan benar…",
@@ -93,8 +93,8 @@
   "error.language.duplicate": "Bahasa sudah ada",
   "error.language.name": "Masukkan nama bahasa yang valid",
 
-  "error.layout.validation.block": "There's an error in block {blockIndex} in layout {layoutIndex}",
-  "error.layout.validation.settings": "There's an error in layout {index} settings",
+  "error.layout.validation.block": "Ada kesalahan di blok {blockIndex} di tata letak {layoutIndex}",
+  "error.layout.validation.settings": "Ada kesalahan di pengaturan tata letak {index}",
 
   "error.license.format": "Masukkan kode lisensi yang valid",
   "error.license.email": "Masukkan surel yang valid",
@@ -232,6 +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.list.name": "Daftar",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Teks",

i18n/translations/it.json

@@ -232,6 +232,7 @@
   "field.blocks.image.name": "Immagine",
   "field.blocks.image.placeholder": "Seleziona un'immagine",
   "field.blocks.image.ratio": "Rapporto",
+  "field.blocks.image.url": "Image URL",
   "field.blocks.list.name": "Lista",
   "field.blocks.markdown.name": "Markdown",
   "field.blocks.markdown.label": "Testo",