Skip to content

Commit a7697cd

Browse files
Merge pull request #7925 from getkirby/release/5.2.3
5.2.3
2 parents 55563aa + ae23f13 commit a7697cd

37 files changed

Lines changed: 682 additions & 192 deletions

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ If applicable, add links to existing docs pages where the docs can be placed.
6363
-->
6464

6565

66-
### For review team
66+
## For review team
6767
<!--
6868
We will take care of the following before merging the PR.
6969
-->

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "The Kirby core",
44
"license": "proprietary",
55
"type": "kirby-cms",
6-
"version": "5.2.2",
6+
"version": "5.2.3",
77
"keywords": [
88
"kirby",
99
"cms",
@@ -43,7 +43,7 @@
4343
"getkirby/composer-installer": "^1.2.1",
4444
"laminas/laminas-escaper": "2.18.0",
4545
"michelf/php-smartypants": "1.8.1",
46-
"phpmailer/phpmailer": "7.0.1",
46+
"phpmailer/phpmailer": "7.0.2",
4747
"symfony/polyfill-intl-idn": "1.33.0",
4848
"symfony/polyfill-mbstring": "1.33.0",
4949
"symfony/yaml": "7.4.1"

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/areas/account/dialogs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
'submit' => fn () => (new UserTotpEnableDialog())->submit()
6060
],
6161
'account.totp.disable' => [
62-
'pattern' => '(account)/totp/disable',
6362
...$dialogs['user.totp.disable'],
63+
'pattern' => '(account)/totp/disable',
6464
],
6565
];

config/components.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,14 @@
8080
$template = $mediaRoot . '/{{ name }}{{ attributes }}.{{ extension }}';
8181
$thumbRoot = (new Filename($file->root(), $template, $options))->toString();
8282
$thumbName = basename($thumbRoot);
83+
$job = $mediaRoot . '/.jobs/' . $thumbName . '.json';
8384

84-
// check if the thumb already exists
85-
if (file_exists($thumbRoot) === false) {
85+
// check if the thumb or job file already exists
86+
if (
87+
file_exists($thumbRoot) === false &&
88+
file_exists($job) === false
89+
) {
8690
// if not, create job file
87-
$job = $mediaRoot . '/.jobs/' . $thumbName . '.json';
88-
8991
try {
9092
Data::write(
9193
$job,

i18n/translations/fr.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,9 +298,9 @@
298298
"error.validation.uuid": "Veuillez saisir un UUID valide",
299299
"error.validation.url": "Veuillez saisir une URL valide",
300300

301-
"error.version.discard.permission": "You are not allowed to discard this version",
302-
"error.version.publish.permission": "You are not allowed to publish this version",
303-
"error.version.save.permission": "You are not allowed to change this version",
301+
"error.version.discard.permission": "Vous n’êtes pas autorisé à supprimer cette version",
302+
"error.version.publish.permission": "Vous n’êtes pas autorisé à publier cette version",
303+
"error.version.save.permission": "Vous n’êtes pas autorisé à modifier cette version",
304304

305305
"expand": "Déplier",
306306
"expand.all": "Tout déplier",
@@ -315,7 +315,7 @@
315315
"field.blocks.delete.confirm.all": "Voulez-vous vraiment supprimer tous les blocs ?",
316316
"field.blocks.delete.confirm.selected": "Voulez-vous vraiment supprimer les blocs sélectionnés ?",
317317
"field.blocks.empty": "Pas encore de blocs",
318-
"field.blocks.fieldsets.empty": "Pas encore densembles de champs",
318+
"field.blocks.fieldsets.empty": "Pas encore densembles de champs",
319319
"field.blocks.fieldsets.label": "Veuillez sélectionner un type de bloc…",
320320
"field.blocks.fieldsets.paste": "Pressez <kbd>{{ shortcut }}</kbd> pour importer des dispositions ou blocs depuis votre presse-papier <small>Seuls ceux autorisés dans le champ actuel seront insérés.</small>",
321321
"field.blocks.gallery.name": "Galerie",

i18n/translations/ro.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"account": "Account",
2+
"account": "Cont",
33
"account.changeName": "Schimbă-ți numele",
44
"account.delete": "Șterge-ți contul",
55
"account.delete.confirm": "Chiar vrei să îți ștergi contul? Vei fi deconectat imediat. Contul nu poate fi recuperat.",
@@ -16,7 +16,7 @@
1616
"changes": "Schimbări",
1717
"confirm": "Ok",
1818
"collapse": "Pliază",
19-
"collapse.all": "Collapse all",
19+
"collapse.all": "Închide toate",
2020
"color": "Culoare",
2121
"coordinates": "Coordonate",
2222
"copy": "Copiază",
@@ -44,8 +44,8 @@
4444
"delete": "\u0218terge",
4545
"delete.all": "Șterge toate",
4646

47-
"deselect": "Deselect",
48-
"deselect.all": "Deselect all",
47+
"deselect": "Deselectează",
48+
"deselect.all": "Deselectează toate",
4949

5050
"dialog.fields.empty": "Acest dialog nu are niciun câmp",
5151
"dialog.files.empty": "Nu există fișiere de selectat",
@@ -298,12 +298,12 @@
298298
"error.validation.uuid": "Te rog introdu un UUID valid",
299299
"error.validation.url": "Te rog introdu un URL valid",
300300

301-
"error.version.discard.permission": "You are not allowed to discard this version",
302-
"error.version.publish.permission": "You are not allowed to publish this version",
303-
"error.version.save.permission": "You are not allowed to change this version",
301+
"error.version.discard.permission": "Nu ai voie să înlături această versiune",
302+
"error.version.publish.permission": "Nu ai voie să publici această versiune",
303+
"error.version.save.permission": "Nu ai voie să modifici această versiune",
304304

305305
"expand": "Extinde",
306-
"expand.all": "Expand all",
306+
"expand.all": "Deschide toate",
307307

308308
"field.invalid": "Câmpul este nevalid",
309309
"field.required": "Acest câmp este necesar",
@@ -384,7 +384,7 @@
384384

385385
"field.structure.delete.confirm": "Chiar vrei să ștergi acest rând?",
386386
"field.structure.delete.confirm.all": "Chiar vrei să ștergi toate înregistrările?",
387-
"field.structure.delete.confirm.selected": "Do you really want to delete the selected entries?",
387+
"field.structure.delete.confirm.selected": "Chiar vrei să ștergi toate intrările alese?",
388388
"field.structure.empty": "Nicio înregistrare deocamdată",
389389

390390
"field.users.empty": "Niciun utilizator ales deocamdată",
@@ -483,7 +483,7 @@
483483
"license.code": "Cod",
484484
"license.code.help": "Ați primit codul de licență după achiziție prin e-mail. Vă rugăm să-l copiați și să-l inserezi aici.",
485485
"license.code.label": "Te rog introdu codul tău de licență",
486-
"license.remove.text": "<p>Removing the license will irreversibly delete the license file from this site. You can then activate this site with a different license key or re-register the same license key if the domain remains the same.</p><p>To change the domain associated with the license, please contact the Kirby team. <a href='https://getkirby.com/license'>Read more &rarr;</a></p>",
486+
"license.remove.text": "<p>Prin înlăturarea licenței se va șterge în mod ireversibil fișierul de licență de pe acest site. Vei putea apoi activa site-ul cu o altă cheie de licență sau să folosești din nou aceeași cheie în caz că domeniul rămâne același.</p><p>Pentru a schimba domeniul asociat licenței, contactează te rog echipa Kirby. <a href='https://getkirby.com/license'>Citește mai multe &rarr;</a></p>",
487487
"license.status.active.info": "Include noi versiuni majore până la data de {date}",
488488
"license.status.active.label": "Licență validă",
489489
"license.status.demo.info": "Aceasta este o instalare demo",
@@ -671,7 +671,7 @@
671671

672672
"security": "Securitate",
673673
"select": "Alege",
674-
"select.all": "Select all",
674+
"select.all": "Alege toate",
675675
"server": "Server",
676676
"settings": "Reglaje",
677677
"show": "Arată",
@@ -780,7 +780,7 @@
780780
"user.changePassword.current": "Parola ta curentă",
781781
"user.changePassword.new": "Parola nouă",
782782
"user.changePassword.new.confirm": "Confirmă parola nouă...",
783-
"user.changePassword.own": "Your own password",
783+
"user.changePassword.own": "Parola proprie",
784784
"user.changeRole": "Schimbă rolul",
785785
"user.changeRole.select": "Alege un rol nou",
786786
"user.create": "Adaugă un nou utilizator",

panel/dist/js/index.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

panel/dist/js/vendor.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

panel/dist/ui/TimeField.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"displayName":"TimeField","description":"Form field to handle a time value.\n\nHave a look at `<k-field>`, `<k-input>`\nand `<k-time-input>` for additional information.","tags":{"examples":[{"title":"example","content":"<k-time-field :value=\"time\" @input=\"time = $event\" name=\"time\" label=\"Time\" />"}]},"props":[{"name":"disabled","description":"If `true`, the field is no longer editable and will not be saved","type":{"name":"boolean"}},{"name":"help","description":"Optional help text below the field","type":{"name":"string"}},{"name":"id","description":"A unique ID. The component `_uid` will be used as default.","type":{"name":"number|string"},"defaultValue":{"value":"function() {\n return this._uid;\n}"}},{"name":"label","description":"A descriptive label for the field","type":{"name":"string|boolean"}},{"name":"name","description":"A unique name for the input","type":{"name":"number|string"}},{"name":"required","description":"If `true`, the field has to be filled in correctly to be submitted","type":{"name":"boolean"}},{"name":"counter","type":{"name":"boolean|object"}},{"name":"endpoints","type":{"name":"object"}},{"name":"input","type":{"name":"string|number|boolean"},"defaultValue":{"value":"null"}},{"name":"translate","type":{"name":"boolean"}},{"name":"type","type":{"name":"string"},"defaultValue":{"value":"\"time\""}},{"name":"after","description":"Optional text that will be shown after the input","type":{"name":"string"}},{"name":"before","description":"Optional text that will be shown before the input","type":{"name":"string"}},{"name":"autofocus","type":{"name":"boolean"}},{"name":"icon","type":{"name":"string"},"description":"Icon used for the input (and times dropdown)","defaultValue":{"value":"\"clock\""}},{"name":"value","type":{"name":"string"},"defaultValue":{"value":"null"},"description":"Value must be provided as ISO time string","tags":{"example":[{"description":"`22:33:00`","title":"example"}]}},{"name":"max","description":"The last allowed time as ISO time string","tags":{"example":[{"description":"`22:30:00`","title":"example"}]},"type":{"name":"string"}},{"name":"min","description":"The first allowed time as ISO time string","tags":{"example":[{"description":"`01:30:00`","title":"example"}]},"type":{"name":"string"}},{"name":"display","description":"Format to parse and display the time","tags":{"example":[{"description":"`hh:mm a`","title":"example"}]},"values":["HH","H","hh","h","mm","m","ss","s","a"],"type":{"name":"string"},"defaultValue":{"value":"\"HH:mm\""}},{"name":"step","description":"Rounding to the nearest step.\nRequires an object with a `unit`\nand a `size` key","tags":{"example":[{"description":"{ unit: 'second', size: 15 }","title":"example"}]},"type":{"name":"object"},"defaultValue":{"value":"{\n size: 5,\n unit: \"minute\"\n}"}},{"name":"times","description":"Deactivate the times dropdown or not","type":{"name":"boolean"},"defaultValue":{"value":"true"}}],"events":[{"name":"input","type":{"names":["undefined"]}},{"name":"focus"},{"name":"blur"},{"name":"submit"}],"methods":[{"name":"focus","description":"Focuses the input element","tags":{"access":[{"description":"public"}]}}],"slots":[{"name":"header"},{"name":"label"},{"name":"options"},{"name":"counter"},{"name":"default"},{"name":"footer"},{"name":"help"},{"name":"before"},{"name":"after"},{"name":"icon"}],"component":"k-time-field","sourceFile":"src/components/Forms/Field/TimeField.vue"}
1+
{"displayName":"TimeField","description":"Form field to handle a time value.\n\nHave a look at `<k-field>`, `<k-input>`\nand `<k-time-input>` for additional information.","tags":{"examples":[{"title":"example","content":"<k-time-field :value=\"time\" @input=\"time = $event\" name=\"time\" label=\"Time\" />"}]},"props":[{"name":"disabled","description":"If `true`, the field is no longer editable and will not be saved","type":{"name":"boolean"}},{"name":"help","description":"Optional help text below the field","type":{"name":"string"}},{"name":"id","description":"A unique ID. The component `_uid` will be used as default.","type":{"name":"number|string"},"defaultValue":{"value":"function() {\n return this._uid;\n}"}},{"name":"label","description":"A descriptive label for the field","type":{"name":"string|boolean"}},{"name":"name","description":"A unique name for the input","type":{"name":"number|string"}},{"name":"required","description":"If `true`, the field has to be filled in correctly to be submitted","type":{"name":"boolean"}},{"name":"counter","type":{"name":"boolean|object"}},{"name":"endpoints","type":{"name":"object"}},{"name":"input","type":{"name":"string|number|boolean"},"defaultValue":{"value":"null"}},{"name":"translate","type":{"name":"boolean"}},{"name":"type","type":{"name":"string"},"defaultValue":{"value":"\"time\""}},{"name":"after","description":"Optional text that will be shown after the input","type":{"name":"string"}},{"name":"before","description":"Optional text that will be shown before the input","type":{"name":"string"}},{"name":"autofocus","type":{"name":"boolean"}},{"name":"icon","type":{"name":"string"},"description":"Icon used for the input (and times dropdown)","defaultValue":{"value":"\"clock\""}},{"name":"value","type":{"name":"string"},"defaultValue":{"value":"null"},"description":"Value must be provided as ISO time string","tags":{"example":[{"description":"`22:33:00`","title":"example"}]}},{"name":"max","description":"The last allowed time as ISO time string","tags":{"example":[{"description":"`22:30:00`","title":"example"}]},"type":{"name":"string"}},{"name":"min","description":"The first allowed time as ISO time string","tags":{"example":[{"description":"`01:30:00`","title":"example"}]},"type":{"name":"string"}},{"name":"display","description":"Format to parse and display the time","tags":{"example":[{"description":"`hh:mm a`","title":"example"}]},"values":["HH","H","hh","h","mm","m","ss","s","a"],"type":{"name":"string"},"defaultValue":{"value":"\"HH:mm\""}},{"name":"step","description":"Rounding to the nearest step.\nRequires an object with a `unit`\nand a `size` key","tags":{"example":[{"description":"{ unit: 'second', size: 15 }","title":"example"}]},"type":{"name":"object"},"defaultValue":{"value":"{\n size: 5,\n unit: \"minute\"\n}"}},{"name":"times","description":"Deactivate the times dropdown or not","type":{"name":"boolean"},"defaultValue":{"value":"true"}}],"events":[{"name":"input","type":{"names":["undefined"]}},{"name":"submit"},{"name":"focus"},{"name":"blur"}],"methods":[{"name":"focus","description":"Focuses the input element","tags":{"access":[{"description":"public"}]}}],"slots":[{"name":"header"},{"name":"label"},{"name":"options"},{"name":"counter"},{"name":"default"},{"name":"footer"},{"name":"help"},{"name":"before"},{"name":"after"},{"name":"icon"}],"component":"k-time-field","sourceFile":"src/components/Forms/Field/TimeField.vue"}

0 commit comments

Comments
 (0)