NEXT-29917 - Housekeep of global default snippets (Add/Apply/Cancel/M…

…isc)
pweyck · Dec 13, 2024 · 75041bd · 75041bd
1 parent 58fd14e
commit 75041bd
Show file tree

Hide file tree

Showing 156 changed files with 115 additions and 314 deletions.
diff --git a/...src/app/component/app/sw-app-app-url-changed-modal/sw-app-app-url-changed-modal.html.twig b/...src/app/component/app/sw-app-app-url-changed-modal/sw-app-app-url-changed-modal.html.twig
@@ -80,7 +80,7 @@
 
     <template #modal-footer>
         <sw-button @click="closeModal">
-            {{ $tc('sw-app.component.sw-app-app-url-changed-modal.cancellation') }}
+            {{ $tc('global.default.cancel') }}
         </sw-button>
 
         <sw-button

diff --git a/...dministration/src/app/component/rule/condition-type/sw-condition-is-always-valid/index.js b/...dministration/src/app/component/rule/condition-type/sw-condition-is-always-valid/index.js
@@ -29,7 +29,7 @@ Component.extend('sw-condition-is-always-valid', 'sw-condition-base', {
         selectValues() {
             return [
                 {
-                    label: this.$tc('global.sw-condition.condition.yes'),
+                    label: this.$tc('global.default.yes'),
                     value: true,
                 },
             ];

diff --git a/...dministration/src/app/component/utils/sw-verify-user-modal/sw-verify-user-modal.html.twig b/...dministration/src/app/component/utils/sw-verify-user-modal/sw-verify-user-modal.html.twig
@@ -29,7 +29,7 @@
             size="small"
             @click="onCloseConfirmPasswordModal"
         >
-            {{ $tc('sw-users-permissions.users.user-detail.passwordConfirmation.labelButtonCancel') }}
+            {{ $tc('global.default.cancel') }}
         </sw-button>
         {% endblock %}
 

diff --git a/src/Administration/Resources/app/administration/src/app/mixin/generic-condition.mixin.ts b/src/Administration/Resources/app/administration/src/app/mixin/generic-condition.mixin.ts
@@ -154,11 +154,11 @@ export default Mixin.register(
             boolOptions() {
                 return [
                     {
-                        label: this.$tc('global.sw-condition.condition.yes'),
+                        label: this.$tc('global.default.yes'),
                         value: true,
                     },
                     {
-                        label: this.$tc('global.sw-condition.condition.no'),
+                        label: this.$tc('global.default.no'),
                         value: false,
                     },
                 ];

diff --git a/src/Administration/Resources/app/administration/src/app/snippet/de-DE.json b/src/Administration/Resources/app/administration/src/app/snippet/de-DE.json
@@ -734,8 +734,6 @@
         "orderCustomFieldRule": "Bestellung mit Zusatzfeld",
         "orderDocumentTypeRule": "Bestellung mit Dokument",
         "orderDocumentTypeSentRule": "Bestellung mit gesendetem Dokument",
-        "yes": "Ja",
-        "no": "Nein",
         "withTime": "Mit Zeitabfrage",
         "withoutTime": "Ohne Zeitabfrage",
         "and": "Und",
@@ -1544,7 +1542,6 @@
         "explanationHeader": "Deine Shop-Domain hat sich geändert.",
         "explanation": "Die installierten Apps sind immer noch mit der alten Domain verbunden und funktionieren mit der neuen Domain noch nicht. Du hast drei Optionen um fortzufahren:",
         "confirmation": "Bestätigen",
-        "cancellation": "Abbrechen",
         "success": "Domain Änderung erfolgreich durchgeführt.",
         "error": "Keine Änderung durchgeführt."
       },

diff --git a/src/Administration/Resources/app/administration/src/app/snippet/en-GB.json b/src/Administration/Resources/app/administration/src/app/snippet/en-GB.json
@@ -734,8 +734,6 @@
         "orderCustomFieldRule": "Order with custom field",
         "orderDocumentTypeRule": "Order with document",
         "orderDocumentTypeSentRule": "Order with sent document",
-        "yes": "Yes",
-        "no": "No",
         "withTime": "Including timestamp",
         "withoutTime": "Excluding timestamp",
         "and": "And",
@@ -1544,7 +1542,6 @@
         "explanationHeader": "We have noticed a change in your shop domain.",
         "explanation": "Installed apps are still connected with the old domain and won't work with the new domain. There are three options from here to proceed.",
         "confirmation": "Confirm",
-        "cancellation": "Cancel",
         "success": "Domain changed.",
         "error": "Error while changing domain for apps"
       },

diff --git a/...mponent/product/sw-bulk-edit-product-visibility/sw-bulk-edit-product-visibility.html.twig b/...mponent/product/sw-bulk-edit-product-visibility/sw-bulk-edit-product-visibility.html.twig
@@ -67,7 +67,7 @@
                 size="small"
                 @click="closeModal"
             >
-                {{ $tc('sw-product.visibility.closeModal') }}
+                {{ $tc('global.default.apply') }}
             </sw-button>
         </template>
     </sw-modal>

diff --git a/...es/app/administration/src/module/sw-bulk-edit/component/sw-bulk-edit-change-type/index.js b/...es/app/administration/src/module/sw-bulk-edit/component/sw-bulk-edit-change-type/index.js
@@ -78,14 +78,14 @@ export default {
             if (this.allowAdd) {
                 options.push({
                     value: 'add',
-                    label: this.$tc('sw-bulk-edit.changeTypes.add'),
+                    label: this.$tc('global.default.add'),
                 });
             }
 
             if (this.allowRemove) {
                 options.push({
                     value: 'remove',
-                    label: this.$tc('sw-bulk-edit.changeTypes.remove'),
+                    label: this.$tc('global.default.remove'),
                 });
             }
 

diff --git a/...c/module/sw-bulk-edit/component/sw-bulk-edit-change-type/sw-bulk-edit-change-type.spec.js b/...c/module/sw-bulk-edit/component/sw-bulk-edit-change-type/sw-bulk-edit-change-type.spec.js
@@ -79,7 +79,7 @@ describe('src/module/sw-bulk-edit/component/sw-bulk-edit-change-type', () => {
         await flushPromises();
 
         const selectAdd = wrapper.find('.sw-select-option--2');
-        expect(selectAdd.text()).toBe('sw-bulk-edit.changeTypes.add');
+        expect(selectAdd.text()).toBe('global.default.add');
         await selectAdd.trigger('click');
 
         expect(wrapper.vm.isDisplayingValue).toBeTruthy();
@@ -100,9 +100,9 @@ describe('src/module/sw-bulk-edit/component/sw-bulk-edit-change-type', () => {
         await flushPromises();
 
         const selectClear = wrapper.find('.sw-select-option--0');
-        expect(selectClear.text()).toBe('sw-bulk-edit.changeTypes.add');
+        expect(selectClear.text()).toBe('global.default.add');
 
         const selectRemove = wrapper.find('.sw-select-option--1');
-        expect(selectRemove.text()).toBe('sw-bulk-edit.changeTypes.remove');
+        expect(selectRemove.text()).toBe('global.default.remove');
     });
 });
diff --git a/...administration/src/module/sw-bulk-edit/component/sw-bulk-edit-save-modal-process/index.js b/...administration/src/module/sw-bulk-edit/component/sw-bulk-edit-save-modal-process/index.js
@@ -111,7 +111,7 @@ export default {
             const buttonConfig = [
                 {
                     key: 'cancel',
-                    label: this.$tc('sw-bulk-edit.modal.process.buttons.cancel'),
+                    label: this.$tc('global.default.cancel'),
                     position: 'left',
                     action: '',
                     disabled: false,

diff --git a/src/Administration/Resources/app/administration/src/module/sw-bulk-edit/snippet/de-DE.json b/src/Administration/Resources/app/administration/src/module/sw-bulk-edit/snippet/de-DE.json
@@ -7,9 +7,7 @@
     },
     "changeTypes": {
       "overwrite": "Überschreiben",
-      "clear": "Leeren",
-      "add": "Hinzufügen",
-      "remove": "Entfernen"
+      "clear": "Leeren"
     },
     "product": {
       "textTitle": "Mehrfachänderung: {productTotal} Produkt | Mehrfachänderung: {productTotal} Produkte",
@@ -251,10 +249,7 @@
       "process": {
         "title": "Mehrfachänderung - Prozess gestartet",
         "description": "Abhängig von der Anzahl der vergenommenen Änderungen, kann dieser Vorgang einige Zeit in Anspruch nehmen.",
-        "helpText": "Bitte beachte, dass Du während des Mehrfachänderungsvorgangs keine manuellen Änderungen an den ausgewählten Elementen vornimmst, da dies unvorhergesehene Effekte haben kann.",
-        "buttons": {
-          "cancel": "Abbrechen"
-        }
+        "helpText": "Bitte beachte, dass Du während des Mehrfachänderungsvorgangs keine manuellen Änderungen an den ausgewählten Elementen vornimmst, da dies unvorhergesehene Effekte haben kann."
       },
       "success": {
         "title": "Mehrfachänderung - Erfolg",

diff --git a/src/Administration/Resources/app/administration/src/module/sw-bulk-edit/snippet/en-GB.json b/src/Administration/Resources/app/administration/src/module/sw-bulk-edit/snippet/en-GB.json
@@ -7,9 +7,7 @@
     },
     "changeTypes": {
       "overwrite": "Overwrite",
-      "clear": "Clear",
-      "add": "Add",
-      "remove": "Remove"
+      "clear": "Clear"
     },
     "product": {
       "textTitle": "Bulk edit: {productTotal} product | Bulk edit: {productTotal} products",
@@ -251,10 +249,7 @@
       "process": {
         "title": "Bulk edit - In process",
         "description": "Depending on the amount of changes, this may take a while.",
-        "helpText": "Please be aware that manual changes to one of the selected items during the bulk edit process may yield unwanted results.",
-        "buttons": {
-          "cancel": "Cancel"
-        }
+        "helpText": "Please be aware that manual changes to one of the selected items during the bulk edit process may yield unwanted results."
       },
       "success": {
         "title": "Bulk edit - Success",

diff --git a/...dministration/src/module/sw-category/page/sw-category-detail/sw-category-detail.html.twig b/...dministration/src/module/sw-category/page/sw-category-detail/sw-category-detail.html.twig
@@ -50,7 +50,7 @@
                 :disabled="isLoading"
                 @click="cancelEdit"
             >
-                {{ $tc('sw-product.detail.buttonCancel') }}
+                {{ $tc('global.default.cancel') }}
             </sw-button>
             {% endblock %}
 

diff --git a/...istration/src/module/sw-cms/component/sw-cms-create-wizard/sw-cms-create-wizard.html.twig b/...istration/src/module/sw-cms/component/sw-cms-create-wizard/sw-cms-create-wizard.html.twig
@@ -47,7 +47,7 @@
                 <sw-icon
                     name="regular-times-s"
                     small
-                /> {{ $tc('sw-cms.createWizard.abortCreation') }}
+                /> {{ $tc('global.default.cancel') }}
             </router-link>
             {% endblock %}
 

diff --git a/.../sw-cms/component/sw-cms-layout-assignment-modal/sw-cms-layout-assignment-modal.html.twig b/.../sw-cms/component/sw-cms-layout-assignment-modal/sw-cms-layout-assignment-modal.html.twig
@@ -362,7 +362,7 @@
                     size="small"
                     @click="onDiscardChanges"
                 >
-                    {{ $tc('sw-cms.components.cmsLayoutAssignmentModal.confirmChangesRestorePrev') }}
+                    {{ $tc('global.default.discard') }}
                 </sw-button>
                 {% endblock %}
 
@@ -374,7 +374,7 @@
                     size="small"
                     @click="onConfirmChanges"
                 >
-                    {{ $tc('sw-cms.components.cmsLayoutAssignmentModal.confirmChangesConfirm') }}
+                    {{ $tc('global.default.confirm') }}
                 </sw-button>
                 {% endblock %}
             </div>
@@ -406,7 +406,7 @@
             variant="primary"
             @click="onConfirm"
         >
-            {{ $tc('sw-cms.components.cmsLayoutAssignmentModal.confirmChanges') }}
+            {{ $tc('global.default.apply') }}
         </sw-button>
         {% endblock %}
     </template>

diff --git a/...inistration/src/module/sw-cms/component/sw-cms-layout-modal/sw-cms-layout-modal.html.twig b/...inistration/src/module/sw-cms/component/sw-cms-layout-modal/sw-cms-layout-modal.html.twig
@@ -215,7 +215,7 @@
     {% block sw_cms_layout_modal_footer %}
     <template #modal-footer>
         <sw-button @click="closeModal">
-            {{ $tc('sw-cms.components.cmsLayoutModal.actionCancel') }}
+            {{ $tc('global.default.cancel') }}
         </sw-button>
         <sw-button
             variant="primary"

diff --git a/...esources/app/administration/src/module/sw-cms/component/sw-cms-slot/sw-cms-slot.html.twig b/...esources/app/administration/src/module/sw-cms/component/sw-cms-slot/sw-cms-slot.html.twig
@@ -251,7 +251,7 @@
             <!-- eslint-disable-next-line sw-deprecation-rules/no-twigjs-blocks -->
             {% block sw_cms_slot_content_element_modal_action_abort %}
             <sw-button @click="onCloseElementModal">
-                {{ $tc('sw-cms.detail.label.buttonElementChangeAbort') }}
+                {{ $tc('global.default.cancel') }}
             </sw-button>
             {% endblock %}
         </template>

diff --git a/...ion/Resources/app/administration/src/module/sw-cms/page/sw-cms-list/sw-cms-list.html.twig b/...ion/Resources/app/administration/src/module/sw-cms/page/sw-cms-list/sw-cms-list.html.twig
@@ -494,7 +494,7 @@
                         size="small"
                         @click="onCloseRenameModal"
                     >
-                        {{ $tc('sw-cms.components.cmsListItem.modal.buttonCancel') }}
+                        {{ $tc('global.default.cancel') }}
                     </sw-button>
                     {% endblock %}
 
@@ -538,7 +538,7 @@
                         size="small"
                         @click="onCloseDeleteModal"
                     >
-                        {{ $tc('sw-cms.components.cmsListItem.modal.buttonCancel') }}
+                        {{ $tc('global.default.cancel') }}
                     </sw-button>
                     {% endblock %}
 

diff --git a/src/Administration/Resources/app/administration/src/module/sw-cms/snippet/de-DE.json b/src/Administration/Resources/app/administration/src/module/sw-cms/snippet/de-DE.json
@@ -78,7 +78,6 @@
       "chooseSectionHelpText": "Sektionen teilen Deine Arbeitsbühne in Bereiche, in denen Du kreativ sein kannst. Du kannst Sektionen miteinander kombinieren und jederzeit wieder entfernen oder verschieben.",
       "chooseNameTitle": "Wie soll Dein Layout heißen?",
       "createLayout": "Layout erstellen",
-      "abortCreation": "Abbrechen",
       "stepBack": "Zurück"
     },
     "detail": {
@@ -118,7 +117,6 @@
         "blockCategoryApp": "Apps",
         "blockCategoryHtml": "HTML",
         "buttonElementSettingsConfirm": "Fertig",
-        "buttonElementChangeAbort": "Abbrechen",
         "blockNameField": "Block-Name",
         "blockNameFieldPlaceholder": "Gib einen Namen ein ...",
         "blockSizingField": "Größenmodus",
@@ -741,7 +739,6 @@
         "infoText": "Bitte beachte, dass alle Produkte, die derzeit einem Standardlayout zugewiesen sind, diesem Layout zugewiesen werden und dass neu erstellte Produkte diesem Layout automatisch zugewiesen werden. Möchtest Du dieses Layout wirklich als Standard verwenden? | Bitte beachte, dass alle Kategorien, die derzeit einem Standardlayout zugewiesen sind, diesem Layout zugewiesen werden und dass neu erstellte Kategorien diesem Layout automatisch zugewiesen werden. Möchtest Du dieses Layout wirklich als Standard verwenden?"
       },
       "cmsLayoutModal": {
-        "actionCancel": "Abbrechen",
         "actionConfirm": "Layout übernehmen",
         "modalTitle": "Layout auswählen",
         "headline": "Landingpage / Produktlisting"
@@ -758,9 +755,6 @@
         "resetOptionSalesChannel": "Alle Verkaufskanäle",
         "helpTextSalesChannel": "Layouts, die spezifischen Verkaufskanälen zugewiesen sind, überschreiben Layout-Zuweisungen in \"Alle Verkaufskanäle\".",
         "labelShopPages": "Shopseiten",
-        "confirmChanges": "Übernehmen",
-        "confirmChangesConfirm": "Übernehmen",
-        "confirmChangesRestorePrev": "Verwerfen",
         "confirmChangesTextCategories": "Du hast Layout-Zuweisungen von Kategorie entfernt. Wenn Du diese Änderungen bestätigst, ist für diese Kategorien kein Layout mehr zugewiesen.",
         "confirmChangesTextCategoriesAssignedLayouts": "Einigen der ausgewählten Kategorien ist bereits ein Layout zugewiesen. Wenn Du fortfährst, werden die bestehenden Zuweisungen durch das aktuelle Layout ersetzt.",
         "confirmChangesTextProducts": "Sie haben Layoutzuweisungen aus Produkten entfernt. Wenn Sie diese Änderungen bestätigen, ist diesen Produkten kein Layout mehr zugewiesen.",
@@ -822,7 +816,6 @@
           "textRenameConfirm": "Wähle einen neuen Namen für \"{pageName}\":",
           "textDeleteConfirm": "Möchtest Du das Layout \"{pageName}\" wirklich löschen?",
           "buttonRename": "Umbenennen",
-          "buttonCancel": "Abbrechen",
           "buttonDelete": "Löschen"
         }
       }

diff --git a/src/Administration/Resources/app/administration/src/module/sw-cms/snippet/en-GB.json b/src/Administration/Resources/app/administration/src/module/sw-cms/snippet/en-GB.json
@@ -78,7 +78,6 @@
       "chooseSectionHelpText": "Sections divide your working space into areas and help you to be more creative. You may combine different sections and move or delete them at any time.",
       "chooseNameTitle": "How do you want to label your new layout?",
       "createLayout": "Create layout",
-      "abortCreation": "Cancel",
       "stepBack": "Back"
     },
     "detail": {
@@ -118,7 +117,6 @@
         "blockCategoryHtml": "HTML",
         "blockCategoryApp": "Apps",
         "buttonElementSettingsConfirm": "Done",
-        "buttonElementChangeAbort": "Cancel",
         "blockNameField": "Block name",
         "blockNameFieldPlaceholder": "Enter name...",
         "blockSizingField": "Sizing mode",
@@ -741,7 +739,6 @@
         "infoText": "Please note that all products that are currently assigned to a default layout will be reassigned to this layout and newly created products will automatically be assigned to it as well. Do you really want to use this layout as default? | Please note that all categories that are currently assigned to a default layout will be reassigned to this layout and newly created categories will automatically be assigned to it as well. Do you really want to use this layout as default?"
       },
       "cmsLayoutModal": {
-        "actionCancel": "Cancel",
         "actionConfirm": "Save",
         "modalTitle": "Select layout",
         "headline": "Landing page / product listing"
@@ -758,9 +755,6 @@
         "resetOptionSalesChannel": "All Sales Channels",
         "helpTextSalesChannel": "Layouts assigned to specific Sales Channels will override layout assignments in \"All Sales Channels\".",
         "labelShopPages": "Shop pages",
-        "confirmChanges": "Apply",
-        "confirmChangesConfirm": "Apply",
-        "confirmChangesRestorePrev": "Discard",
         "confirmChangesTextCategories": "You have removed layout assignments from categories. If you confirm these changes, those categories will no longer have a layout assigned.",
         "confirmChangesTextCategoriesAssignedLayouts": "Some of the selected categories already have a layout assigned. If you proceed those previous assignments will be replaced with the current layout.",
         "confirmChangesTextLandingPages": "You have removed layout assignments from landing pages. If you confirm these changes, those landing pages will no longer have a layout assigned.",
@@ -822,7 +816,6 @@
           "textRenameConfirm": "Choose a new name for \"{pageName}\":",
           "textDeleteConfirm": "Are you sure you really want to delete the layout \"{pageName}\"?",
           "buttonRename": "Rename",
-          "buttonCancel": "Cancel",
           "buttonDelete": "Delete"
         }
       }

diff --git a/...dministration/src/module/sw-customer/page/sw-customer-detail/sw-customer-detail.html.twig b/...dministration/src/module/sw-customer/page/sw-customer-detail/sw-customer-detail.html.twig
@@ -50,7 +50,7 @@
                 :disabled="isLoading"
                 @click="onAbortButtonClick"
             >
-                {{ $tc('sw-customer.detail.buttonCancel') }}
+                {{ $tc('global.default.cancel') }}
             </sw-button>
             {% endblock %}
 

diff --git a/...pp/administration/src/module/sw-customer/page/sw-customer-list/sw-customer-list.html.twig b/...pp/administration/src/module/sw-customer/page/sw-customer-list/sw-customer-list.html.twig
@@ -306,7 +306,7 @@
                                 size="small"
                                 @click="onCloseDeleteModal"
                             >
-                                {{ $tc('sw-customer.list.buttonCancel') }}
+                                {{ $tc('global.default.cancel') }}
                             </sw-button>
                             {% endblock %}
 

diff --git a/src/Administration/Resources/app/administration/src/module/sw-customer/snippet/de-DE.json b/src/Administration/Resources/app/administration/src/module/sw-customer/snippet/de-DE.json
@@ -80,7 +80,6 @@
       "contextMenuEdit": "Bearbeiten",
       "messageEmpty": "Noch keine Kunden",
       "textDeleteConfirm": "Möchtest Du den Kunden \"{name}\" wirklich löschen?",
-      "buttonCancel": "Abbrechen",
       "buttonDelete": "Löschen",
       "titleSidebarItemRefresh": "Aktualisieren",
       "titleSidebarItemFilter": "Filter",
@@ -157,10 +156,7 @@
     },
     "detailAddresses": {
       "buttonAddAddress": "Adresse anlegen",
-      "buttonAdd": "Anlegen",
-      "buttonCancel": "Abbrechen",
       "buttonClose": "Schließen",
-      "buttonApply": "Übernehmen",
       "buttonDelete": "Löschen",
       "buttonSelect": "Auswahl",
       "buttonSaveAndSelect": "Speichern und auswählen",
@@ -237,7 +233,6 @@
     },
     "detail": {
       "buttonSave": "Speichern",
-      "buttonCancel": "Abbrechen",
       "buttonEdit": "Bearbeiten",
       "tabGeneral": "Allgemein",
       "tabAddresses": "Adressen",