Skip to content

Commit

Permalink
Merge branch '5.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonvarga committed Feb 4, 2025
2 parents cff38ae + 779a92a commit d1e046d
Show file tree
Hide file tree
Showing 161 changed files with 182 additions and 554 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# Release Notes

## 5.46.1 (2025-02-04)

### What's fixed
- Fix search:results tag when offset and paginate are set [#11386](https://github.com/statamic/cms/issues/11386) by @nopticon
- Live Preview: Allow changing the position of "Responsive" device option [#11404](https://github.com/statamic/cms/issues/11404) by @duncanmcclean
- Fix additional url segments matching taxonomy terms [#11383](https://github.com/statamic/cms/issues/11383) by @jasonvarga
- Use constructor property promotion in events [#11380](https://github.com/statamic/cms/issues/11380) by @duncanmcclean
- Fix "Curaçao" item in countries dictionary [#11395](https://github.com/statamic/cms/issues/11395) by @duncanmcclean
- Remove duplicate strings from translation files [#11400](https://github.com/statamic/cms/issues/11400) by @j3ll3yfi5h
- German translations [#11399](https://github.com/statamic/cms/issues/11399) by @helloDanuk
- French translations [#11397](https://github.com/statamic/cms/issues/11397) by @ebeauchamps



## 5.46.0 (2025-01-22)

### What's new
Expand Down
11 changes: 10 additions & 1 deletion resources/js/components/live-preview/LivePreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,17 @@ export default {
deviceSelectOptions() {
let options = Object.values(_.mapObject(this.$config.get('livePreview.devices'), (dimensions, device) => {
if (device === 'Responsive') {
return { value: null, label: __('Responsive') };
}
return { value: device, label: __(device) };
}));
options.unshift({ value: null, label: __('Responsive') });
if (options.filter((option) => option.label === __('Responsive')).length === 0) {
options.unshift({ value: null, label: __('Responsive') });
}
return options;
},
Expand Down Expand Up @@ -217,6 +225,7 @@ export default {
},
created() {
this.previewDevice = this.deviceSelectOptions[0].value;
this.editorWidth = localStorage.getItem(widthLocalStorageKey) || 400
this.keybinding = this.$keys.bindGlobal('mod+shift+p', () => {
Expand Down
1 change: 0 additions & 1 deletion resources/lang/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,6 @@
"ID": "معرّف",
"ID regenerated and Stache cleared": "تم تجديد المعرّف ومسح Stache",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "إذا كنت تواجه مشكلة في النقر على زر \":actionText\"، انسخ والصق عنوان URL أدناه\nفي متصفح الويب الخاص بك:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "إذا كنت تواجه مشكلة في النقر على زر \":actionText\"، انسخ والصق عنوان URL أدناه\nفي متصفح الويب الخاص بك:",
"Image": "صورة",
"Image Cache": "ذاكرة تخزين الصور",
"Image cache cleared.": "تم مسح ذاكرة تخزين الصور.",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/az.json
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@
"Icon": "İkon",
"ID": "ID",
"ID regenerated and Stache cleared": "ID yenidən yaradıldı və Stache təmizləndi",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Əgər \":actionText\" düyməsini tıklamaqda çətinlik çəkirsinizsə, aşağıdakı URL-ni kopyalayıb veb brauzerinizə yapışdırın:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Əgər \":actionText\" düyməsini tıklamaqda çətinlik çəkirsinizsə, aşağıdakı URL-ni kopyalayıb veb brauzerinizə yapışdırın:",
"Image": "Şəkil",
"Image Cache": "Şəkil Keşi",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@
"Icon": "Ikona",
"ID": "ID",
"ID regenerated and Stache cleared": "ID obnoveno a Stache vyprázdněno",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Pokud máte potíže s kliknutím na tlačítko „ :actionText “, zkopírujte a vložte níže uvedenou adresu URL do svého webového prohlížeče:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Pokud máte problém s kliknutím na tlačítko \":actionText\", zkopírujte a vložte URL níže do webového prohlížeče:",
"Image": "Obrázek",
"Image Cache": "Cache obrázků",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@
"Icon": "Ikon",
"ID": "ID",
"ID regenerated and Stache cleared": "ID regenereret og Stache ryddet",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Hvis du har problemer med at klikke på knappen \" :actionText \", skal du kopiere og indsætte nedenstående URL i din webbrowser:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Hvis du har problemer med at klikke på knappen \" :actionText \", skal du kopiere og indsætte nedenstående URL i din webbrowser:",
"Image": "Billede",
"Image Cache": "Billedcache",
Expand Down
12 changes: 5 additions & 7 deletions resources/lang/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@
"Code Block": "Codeblock",
"Collapse": "Einklappen",
"Collapse All": "Alle einklappen",
"Collapse All Sets": "Alle Sets einklappen",
"Collapse Set": "Set einklappen",
"Collapse Sets": "Sets einklappen",
"Collection": "Sammlung",
"Collection already exists": "Sammlung existiert bereits",
"Collection created": "Sammlung erstellt",
Expand Down Expand Up @@ -395,6 +395,7 @@
"Email Content": "E-Mail-Inhalt",
"Email Subject": "E-Mail-Betreff",
"Emojis": "Emojis",
"Empty": "Leer",
"Enable Input Rules": "Eingaberegeln aktivieren",
"Enable Line Wrapping": "Zeilenumbrüche aktivieren",
"Enable Paste Rules": "Einfügeregeln aktivieren",
Expand Down Expand Up @@ -430,12 +431,10 @@
"Escape Markup": "Markup escapen",
"Everything is up to date.": "Alles ist auf dem neusten Stand.",
"Example": "Beispiel",
"Exit Fullscreen Mode": "Vollbildmodus beenden",
"Expand": "Ausklappen",
"Expand All": "Alle ausklappen",
"Expand All Sets": "Alle Sets ausklappen",
"Expand Set": "Set ausklappen",
"Expand Sets": "Sets ausklappen",
"Expand\/Collapse Sets": "Sets aus-\/einklappen",
"Expect a root page": "Erwartet eine Startseite",
"Expired": "Abgelaufen",
"Export Submissions": "Antworten exportieren",
Expand Down Expand Up @@ -529,7 +528,6 @@
"Icon": "Icon",
"ID": "ID",
"ID regenerated and Stache cleared": "ID regeneriert und Stache gelöscht",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Wenn du beim Klicken auf den Button „:actionText“ Probleme hast, kopiere die folgende URL und füge sie in deinem Browser ein:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Wenn du beim Klicken auf den Button „:actionText“ Probleme hast, kopiere die folgende URL und füge sie in deinem Browser ein:",
"Image": "Bild",
"Image Cache": "Bildercache",
Expand Down Expand Up @@ -624,6 +622,7 @@
"Markdown paths": "Markdown-Pfade",
"Markdown theme": "Markdown-Thema",
"Max": "Maximum",
"Max Columns": "Maximal zulässige Spalten",
"Max Depth": "Maximale Tiefe",
"Max Files": "Maximal zulässige Dateien",
"Max Items": "Maximal zulässige Einträge",
Expand Down Expand Up @@ -679,6 +678,7 @@
"No templates to choose from.": "Kein Template zur Auswahl.",
"None": "Nichts",
"not": "ist nicht",
"Not empty": "Nicht leer",
"Not equals": "Nicht gleich",
"Not Featured": "Nicht empfohlen",
"Not listable": "Nicht auflistbar",
Expand Down Expand Up @@ -848,7 +848,6 @@
"Searching in:": "Suchen in:",
"Select": "Auswählen",
"Select Across Sites": "Websiteübergreifend auswählen",
"Select asset container": "Datei-Container auswählen",
"Select Collection(s)": "Sammlung(en) auswählen",
"Select Dropdown": "Dropdown Auswahlliste",
"Select Group": "Gruppe auswählen",
Expand Down Expand Up @@ -983,7 +982,6 @@
"Toggle": "Schalter",
"Toggle Button": "Umschaltknopf",
"Toggle Dark Mode": "Dunkler Modus ein-\/ausblenden",
"Toggle Fullscreen": "Vollbild umschalten",
"Toggle Fullscreen Mode": "Vollbildmodus umschalten",
"Toggle Header Cell": "Kopfzelle umschalten",
"Toggle Mobile Nav": "Mobile Navigation umschalten",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/de/dictionary-currencies.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
'NAD' => 'Namibischer Dollar',
'NGN' => 'Nigerianischer Naira',
'NIO' => 'Nicaraguanischer Córdoba',
'NOK' => 'Norwegian Krone',
'NOK' => 'Norwegische Krone',
'NPR' => 'Nepalesische Rupie',
'NZD' => 'Neuseeland-Dollar',
Expand Down
3 changes: 3 additions & 0 deletions resources/lang/de/fieldtypes.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'array.config.keys' => 'Arrayschlüssel (Variablen) und optionale Beschriftungen festlegen.',
'array.config.mode' => 'Der **dynamische** Modus gibt der Benutzer:in freie Kontrolle über die Daten, während der **schlüsselgebundene-** und der **Einzel**-Modus strenge Schlüssel vorschreiben.',
'array.title' => 'Array',
'asset_folders.config.container' => 'Datei-Container für dieses Feld auswählen.',
'assets.config.allow_uploads' => 'Das Hochladen neuer Dateien zulassen.',
'assets.config.container' => 'Datei-Container für dieses Feld auswählen.',
'assets.config.dynamic' => 'Die Dateien werden basierend auf dem Wert dieses Feldes in einem Unterordner abgelegt.',
Expand Down Expand Up @@ -168,6 +169,8 @@
'slug.config.show_regenerate' => 'Die Schaltfläche „Regenerieren“ anzeigen, damit der Slug aus dem Zielfeld erneuert werden kann.',
'slug.title' => 'Slug',
'structures.title' => 'Strukturen',
'table.config.max_columns' => 'Maximale Spaltenanzahl festlegen.',
'table.config.max_rows' => 'Maximale Zeilenanzahl festlegen.',
'table.title' => 'Tabelle',
'taggable.config.options' => 'Vordefinierte Tags zur Verfügung stellen, die dann ausgewählt werden können.',
'taggable.config.placeholder' => 'Tippen und ↩ Enter drücken',
Expand Down
12 changes: 5 additions & 7 deletions resources/lang/de_CH.json
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@
"Code Block": "Codeblock",
"Collapse": "Einklappen",
"Collapse All": "Alle einklappen",
"Collapse All Sets": "Alle Sets einklappen",
"Collapse Set": "Set einklappen",
"Collapse Sets": "Sets einklappen",
"Collection": "Sammlung",
"Collection already exists": "Sammlung existiert bereits",
"Collection created": "Sammlung erstellt",
Expand Down Expand Up @@ -395,6 +395,7 @@
"Email Content": "E-Mail-Inhalt",
"Email Subject": "E-Mail-Betreff",
"Emojis": "Emojis",
"Empty": "Leer",
"Enable Input Rules": "Eingaberegeln aktivieren",
"Enable Line Wrapping": "Zeilenumbrüche aktivieren",
"Enable Paste Rules": "Einfügeregeln aktivieren",
Expand Down Expand Up @@ -430,12 +431,10 @@
"Escape Markup": "Markup escapen",
"Everything is up to date.": "Alles ist auf dem neusten Stand.",
"Example": "Beispiel",
"Exit Fullscreen Mode": "Vollbildmodus beenden",
"Expand": "Ausklappen",
"Expand All": "Alle ausklappen",
"Expand All Sets": "Alle Sets ausklappen",
"Expand Set": "Set ausklappen",
"Expand Sets": "Sets ausklappen",
"Expand\/Collapse Sets": "Sets aus-\/einklappen",
"Expect a root page": "Erwartet eine Startseite",
"Expired": "Abgelaufen",
"Export Submissions": "Antworten exportieren",
Expand Down Expand Up @@ -529,7 +528,6 @@
"Icon": "Icon",
"ID": "ID",
"ID regenerated and Stache cleared": "ID regeneriert und Stache gelöscht",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Wenn du beim Klicken auf den Button «:actionText» Probleme hast, kopiere die folgende URL und füge sie in deinem Browser ein:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Wenn du beim Klicken auf den Button «:actionText» Probleme hast, kopiere die folgende URL und füge sie in deinem Browser ein:",
"Image": "Bild",
"Image Cache": "Bildercache",
Expand Down Expand Up @@ -624,6 +622,7 @@
"Markdown paths": "Markdown-Pfade",
"Markdown theme": "Markdown-Thema",
"Max": "Maximum",
"Max Columns": "Maximal zulässige Spalten",
"Max Depth": "Maximale Tiefe",
"Max Files": "Maximal zulässige Dateien",
"Max Items": "Maximal zulässige Einträge",
Expand Down Expand Up @@ -679,6 +678,7 @@
"No templates to choose from.": "Kein Template zur Auswahl.",
"None": "Nichts",
"not": "ist nicht",
"Not empty": "Nicht leer",
"Not equals": "Nicht gleich",
"Not Featured": "Nicht empfohlen",
"Not listable": "Nicht auflistbar",
Expand Down Expand Up @@ -848,7 +848,6 @@
"Searching in:": "Suchen in:",
"Select": "Auswählen",
"Select Across Sites": "Websiteübergreifend auswählen",
"Select asset container": "Datei-Container auswählen",
"Select Collection(s)": "Sammlung(en) auswählen",
"Select Dropdown": "Dropdown Auswahlliste",
"Select Group": "Gruppe auswählen",
Expand Down Expand Up @@ -983,7 +982,6 @@
"Toggle": "Schalter",
"Toggle Button": "Umschaltknopf",
"Toggle Dark Mode": "Dunkler Modus ein-\/ausblenden",
"Toggle Fullscreen": "Vollbild umschalten",
"Toggle Fullscreen Mode": "Vollbildmodus umschalten",
"Toggle Header Cell": "Kopfzelle umschalten",
"Toggle Mobile Nav": "Mobile Navigation umschalten",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/de_CH/dictionary-currencies.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
'NAD' => 'Namibischer Dollar',
'NGN' => 'Nigerianischer Naira',
'NIO' => 'Nicaraguanischer Córdoba',
'NOK' => 'Norwegian Krone',
'NOK' => 'Norwegische Krone',
'NPR' => 'Nepalesische Rupie',
'NZD' => 'Neuseeland-Dollar',
Expand Down
3 changes: 3 additions & 0 deletions resources/lang/de_CH/fieldtypes.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'array.config.keys' => 'Arrayschlüssel (Variablen) und optionale Beschriftungen festlegen.',
'array.config.mode' => 'Der **dynamische** Modus gibt der Benutzer:in freie Kontrolle über die Daten, während der **schlüsselgebundene-** und der **Einzel**-Modus strenge Schlüssel vorschreiben.',
'array.title' => 'Array',
'asset_folders.config.container' => 'Datei-Container für dieses Feld auswählen.',
'assets.config.allow_uploads' => 'Das Hochladen neuer Dateien zulassen.',
'assets.config.container' => 'Datei-Container für dieses Feld auswählen.',
'assets.config.dynamic' => 'Die Dateien werden basierend auf dem Wert dieses Feldes in einem Unterordner abgelegt.',
Expand Down Expand Up @@ -168,6 +169,8 @@
'slug.config.show_regenerate' => 'Die Schaltfläche «Regenerieren» anzeigen, damit der Slug aus dem Zielfeld erneuert werden kann.',
'slug.title' => 'Slug',
'structures.title' => 'Strukturen',
'table.config.max_columns' => 'Maximale Spaltenanzahl festlegen.',
'table.config.max_rows' => 'Maximale Zeilenanzahl festlegen.',
'table.title' => 'Tabelle',
'taggable.config.options' => 'Vordefinierte Tags zur Verfügung stellen, die dann ausgewählt werden können.',
'taggable.config.placeholder' => 'Tippen und ↩ Enter drücken',
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en/dictionary-countries.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
'CIV' => 'Cote D\'Ivoire (Ivory Coast)',
'HRV' => 'Croatia',
'CUB' => 'Cuba',
'CUW' => 'Cura\\u00e7ao',
'CUW' => 'Curaçao',
'CYP' => 'Cyprus',
'CZE' => 'Czech Republic',
'COD' => 'Democratic Republic of the Congo',
Expand Down
1 change: 0 additions & 1 deletion resources/lang/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@
"Icon": "Icono",
"ID": "IDENTIFICACIÓN",
"ID regenerated and Stache cleared": "ID regenerada y bigote limpiado",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Si tienes problemas para hacer clic en el botón de \":actionText\", copia y pega el siguiente URL en tu navegador:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Si tienes problemas para hacer clic en el botón de \":actionText\", copia y pega el siguiente URL en tu navegador:",
"Image": "Imagen",
"Image Cache": "Caché de imágenes",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/fa.json
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,6 @@
"Icon": "آیکون",
"ID": "شناسه",
"ID regenerated and Stache cleared": "شناسه با موفقیت از نو ساخته و کش خالی شد",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "اگر مشکلی در خصوص کلیلک روی دکمه‌ی \":actionText\" وجود دارد، می‌توانید آدرس زیر را کپی و در آدرس بار مرورگر پیست کنید:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "اگر مشکلی در خصوص کلیلک روی دکمه‌ی \":actionText\" وجود دارد، می‌توانید آدرس زیر را کپی و در آدرس بار مرورگر پیست کنید:",
"Image": "تصویر",
"Image Cache": "کش تصویر",
Expand Down
3 changes: 2 additions & 1 deletion resources/lang/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@
"Email Content": "Contenu de l'email",
"Email Subject": "Sujet de l'email",
"Emojis": "Emojis",
"Empty": "Vide",
"Enable Input Rules": "Activer les règles de saisie",
"Enable Line Wrapping": "Activer le retour à la ligne",
"Enable Paste Rules": "Activer les règles de collage",
Expand Down Expand Up @@ -527,7 +528,6 @@
"Icon": "Icône",
"ID": "ID",
"ID regenerated and Stache cleared": "ID regénéré et Stache effacé",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Si vous ne parvenez pas à cliquer sur le bouton \":actionText\", copiez et collez l'URL ci-dessous dans votre navigateur Web :",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Si vous ne parvenez pas à cliquer sur le bouton \":actionText\", copiez et collez l'URL ci-dessous dans votre navigateur Web :",
"Image": "Image",
"Image Cache": "Cache des images",
Expand Down Expand Up @@ -678,6 +678,7 @@
"No templates to choose from.": "Aucun modèle sélectionnable",
"None": "Aucun(e)",
"not": "différent de",
"Not empty": "Non vide",
"Not equals": "Différent de",
"Not Featured": "Pas mis en vedette",
"Not listable": "Non listable",
Expand Down
3 changes: 1 addition & 2 deletions resources/lang/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -528,8 +528,7 @@
"Icon": "Ikon",
"ID": "ID",
"ID regenerated and Stache cleared": "ID újragenerálva, Stache törölve",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Ha problémába ütközik az " :actionText " gombra kattintva, másolja ki és illessze be az alábbi URL-t a böngészőbe:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Ha nem tudja megkattintani a(z) „:actionText” gombot, másolja ki és illessze be az alábbi URL-t a böngészőjébe:",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Ha nem tudja megkattintani a(z) \":actionText\" gombot, másolja ki és illessze be az alábbi URL-t a böngészőjébe:",
"Image": "Kép",
"Image Cache": "Képgyorsítótár",
"Image cache cleared.": "A képgyorsítótár törölve.",
Expand Down
1 change: 0 additions & 1 deletion resources/lang/id.json
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,6 @@
"ID": "PENGENAL",
"ID regenerated and Stache cleared": "ID dibuat ulang dan Stache dibersihkan",
"If you're having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Jika anda mengalami masalah saat mengklik tombol \":actionText\", salin dan tempel URL di bawah ini ke browser: Anda",
"If you’re having trouble clicking the \":actionText\" button, copy and paste the URL below\ninto your web browser:": "Jika anda mengalami masalah saat mengklik tombol \":actionText\", salin dan tempel URL di bawah ini ke browser: Anda",
"Image": "Gambar",
"Image Cache": "Cache Gambar",
"Image cache cleared.": "ache Gambar dibersihkan",
Expand Down
Loading

0 comments on commit d1e046d

Please sign in to comment.