From 078c117f6ee00f36be24b4d7986fc44764e51bd4 Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 21 Jan 2022 07:35:33 +0100 Subject: [PATCH 1/8] Changed the toasted message for successful creating a creation. --- admin/src/pages/CreationConfirm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 578c9b23f..5a46c4d45 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -75,7 +75,7 @@ export default { case 'confirmed': this.confirmResult.splice(index, 1) this.$store.commit('openCreationsMinus', 1) - this.$toasted.success('Pending Creation has been deleted') + this.$toasted.success('Creation has been created') break default: this.$toasted.error('Case ' + event + ' is not supported') From 397f1f9d67d99f748ed5bdb7919069b4eda0b89a Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 21 Jan 2022 07:41:11 +0100 Subject: [PATCH 2/8] Change the test to match the new toasted message. --- admin/src/pages/CreationConfirm.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index 14a71bb78..024910be8 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -189,7 +189,7 @@ describe('CreationConfirm', () => { }) it('toasts a success message', () => { - expect(toastedSuccessMock).toBeCalledWith('Pending Creation has been deleted') + expect(toastedSuccessMock).toBeCalledWith('Creation has been created') }) }) From 67df6952275b0c5c9d848e8f1ebb0c0ade69edae Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 21 Jan 2022 13:19:36 +0100 Subject: [PATCH 3/8] Localized the CreationConfirm toasted messages. --- admin/src/locales/de.json | 5 ++++- admin/src/locales/en.json | 5 ++++- admin/src/pages/CreationConfirm.spec.js | 6 +++--- admin/src/pages/CreationConfirm.vue | 6 +++--- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 111d6823f..5c9ef1713 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -13,7 +13,10 @@ "submit_creation": "Schöpfung einreichen", "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegt zur Bestätigung bereit", "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit", - "update_creation": "Schöpfung aktualisieren" + "update_creation": "Schöpfung aktualisieren", + "toasted_delete": "Offene Schöpfung wurde gelöscht", + "toasted_created": "Schöpfung wurde erfolgreich erstellt", + "toasted_default": "`Case {event} is not supported`" }, "details": "Details", "e_mail": "E-Mail", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index d412ecfcb..036c1892b 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -13,7 +13,10 @@ "submit_creation": "Submit creation", "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.", "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.", - "update_creation": "Creation update" + "update_creation": "Creation update", + "toasted_delete": "Open creation has been deleted", + "toasted_created": "Creation has been successfully created", + "toasted_default": "`Case {event} is not supported`" }, "details": "Details", "e_mail": "E-Mail", diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index 024910be8..cc0a096da 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -127,7 +127,7 @@ describe('CreationConfirm', () => { }) it('toasts a success message', () => { - expect(toastedSuccessMock).toBeCalledWith('Pending Creation has been deleted') + expect(toastedSuccessMock).toBeCalledWith('creation_form.toasted_delete') }) }) @@ -189,7 +189,7 @@ describe('CreationConfirm', () => { }) it('toasts a success message', () => { - expect(toastedSuccessMock).toBeCalledWith('Creation has been created') + expect(toastedSuccessMock).toBeCalledWith('creation_form.toasted_created') }) }) @@ -201,7 +201,7 @@ describe('CreationConfirm', () => { }) it('toasts an error message', () => { - expect(toastedErrorMock).toBeCalledWith('Case confirm is not supported') + expect(toastedErrorMock).toBeCalledWith('creation_form.toasted_default') }) }) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 5a46c4d45..bfb3100aa 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -66,7 +66,7 @@ export default { index = this.confirmResult.indexOf(findArr) this.confirmResult.splice(index, 1) this.$store.commit('openCreationsMinus', 1) - this.$toasted.success('Pending Creation has been deleted') + this.$toasted.success(this.$t('creation_form.toasted_delete')) }) .catch((error) => { this.$toasted.error(error.message) @@ -75,10 +75,10 @@ export default { case 'confirmed': this.confirmResult.splice(index, 1) this.$store.commit('openCreationsMinus', 1) - this.$toasted.success('Creation has been created') + this.$toasted.success(this.$t('creation_form.toasted_created')) break default: - this.$toasted.error('Case ' + event + ' is not supported') + this.$toasted.error(this.$t('creation_form.toasted_default', { event })) } }, getPendingCreations() { From 6ea44890dd38cd6a44d565aec6e328d4d054ed6f Mon Sep 17 00:00:00 2001 From: elweyn Date: Fri, 21 Jan 2022 15:25:32 +0100 Subject: [PATCH 4/8] Locales where not ordered. yarn locales --fix changes. --- admin/src/locales/de.json | 8 ++++---- admin/src/locales/en.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 5c9ef1713..9042cd400 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -12,11 +12,11 @@ "select_value": "Betrag auswählen", "submit_creation": "Schöpfung einreichen", "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegt zur Bestätigung bereit", - "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit", - "update_creation": "Schöpfung aktualisieren", - "toasted_delete": "Offene Schöpfung wurde gelöscht", "toasted_created": "Schöpfung wurde erfolgreich erstellt", - "toasted_default": "`Case {event} is not supported`" + "toasted_default": "`Case {event} is not supported`", + "toasted_delete": "Offene Schöpfung wurde gelöscht", + "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit", + "update_creation": "Schöpfung aktualisieren" }, "details": "Details", "e_mail": "E-Mail", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 036c1892b..360c3c9c9 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -12,11 +12,11 @@ "select_value": "Select amount", "submit_creation": "Submit creation", "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.", - "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.", - "update_creation": "Creation update", - "toasted_delete": "Open creation has been deleted", "toasted_created": "Creation has been successfully created", - "toasted_default": "`Case {event} is not supported`" + "toasted_default": "`Case {event} is not supported`", + "toasted_delete": "Open creation has been deleted", + "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.", + "update_creation": "Creation update" }, "details": "Details", "e_mail": "E-Mail", From 3132708204fc13a983890e300cda561a1210e377 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Sat, 22 Jan 2022 09:01:35 +0100 Subject: [PATCH 5/8] Update admin/src/locales/en.json --- admin/src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 360c3c9c9..47f98bf94 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -12,7 +12,7 @@ "select_value": "Select amount", "submit_creation": "Submit creation", "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.", - "toasted_created": "Creation has been successfully created", + "toasted_created": " Creation has been successfully saved", "toasted_default": "`Case {event} is not supported`", "toasted_delete": "Open creation has been deleted", "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.", From 9b4510101f2efc01fe99448599e6d72ca817fea9 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Sat, 22 Jan 2022 09:01:58 +0100 Subject: [PATCH 6/8] Update admin/src/locales/de.json --- admin/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 9042cd400..dc474e876 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -12,7 +12,7 @@ "select_value": "Betrag auswählen", "submit_creation": "Schöpfung einreichen", "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegt zur Bestätigung bereit", - "toasted_created": "Schöpfung wurde erfolgreich erstellt", + "toasted_created": "Schöpfung wurde erfolgreich gespeichert", "toasted_default": "`Case {event} is not supported`", "toasted_delete": "Offene Schöpfung wurde gelöscht", "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit", From 5f5ae03042c08540830375ee1b59f218c005f1f0 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Sat, 22 Jan 2022 09:02:13 +0100 Subject: [PATCH 7/8] Update admin/src/locales/de.json --- admin/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index dc474e876..b1a008eaf 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -13,7 +13,7 @@ "submit_creation": "Schöpfung einreichen", "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegt zur Bestätigung bereit", "toasted_created": "Schöpfung wurde erfolgreich gespeichert", - "toasted_default": "`Case {event} is not supported`", + "toasted_default": "`Fall {event} wird nicht unterstützt`", "toasted_delete": "Offene Schöpfung wurde gelöscht", "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit", "update_creation": "Schöpfung aktualisieren" From a72d1ed3c75078da5b385030f574f7669e49c950 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Sat, 22 Jan 2022 09:02:45 +0100 Subject: [PATCH 8/8] Update admin/src/locales/en.json --- admin/src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 47f98bf94..2d2df4461 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -12,7 +12,7 @@ "select_value": "Select amount", "submit_creation": "Submit creation", "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.", - "toasted_created": " Creation has been successfully saved", + "toasted_created": "Creation has been successfully saved", "toasted_default": "`Case {event} is not supported`", "toasted_delete": "Open creation has been deleted", "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",