From ef2345e8255c9b7dc1e73b6763145fad5db08175 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 12:56:44 +0100 Subject: [PATCH 01/45] admin locales for UserSearch.vue --- admin/src/locales/de.json | 11 ++++++++++- admin/src/locales/en.json | 11 ++++++++++- admin/src/pages/UserSearch.vue | 20 ++++++++++---------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 96a409c60..c0df181e4 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -1,4 +1,13 @@ { "not_open_creations": "keine offene Schöpfungen", - "open_creations": "offene Schöpfungen" + "open_creations": "offene Schöpfungen", + "unregistered_emails":"Unregistrierte E-Mails", + "user_search":"User suche", + "e_mail":"E-Mail", + "firstname":"Vorname", + "lastname":"Nachname", + "open_creation":"offene Schöpfungen", + "details":"Details", + "mail":"Mail", + "transaction":"Transaktion" } diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 20ab609e0..fa13363b4 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -1,4 +1,13 @@ { "not_open_creations": "No open creations", - "open_creations": "Open creations" + "open_creations": "Open creations", + "unregistered_emails":"Unregistered e-mails", + "user_search":"User search", + "e_mail":"E-Mail", + "firstname":"Firstname", + "lastname":"Lastname", + "open_creation":"Open creations", + "details":"Details", + "mail":"Mail", + "transaction":"Transaction" } diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 186f2c8ce..5b2ea2180 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -3,15 +3,15 @@
- Anzeigen aller nicht registrierten E-Mails. + {{ $t('unregistered_emails') }}
- + @@ -37,12 +37,12 @@ export default { return { showArrays: false, fields: [ - { key: 'email', label: 'Email' }, - { key: 'firstName', label: 'Firstname' }, - { key: 'lastName', label: 'Lastname' }, + { key: 'email', label: this.$t('e_mail') }, + { key: 'firstName', label: this.$t('firstname') }, + { key: 'lastName', label: this.$t('lastname') }, { key: 'creation', - label: 'Open creations', + label: this.$t('open_creation'), formatter: (value, key, item) => { return ( ` @@ -65,9 +65,9 @@ export default { ) }, }, - { key: 'show_details', label: 'Details' }, - { key: 'confirm_mail', label: 'Mail' }, - { key: 'transactions_list', label: 'Transaction' }, + { key: 'show_details', label: this.$t('details') }, + { key: 'confirm_mail', label: this.$t('mail') }, + { key: 'transactions_list', label: this.$t('transaction') }, ], searchResult: [], massCreation: [], From 16740b9ae67150cc7c02ff195e56672a1a843bcd Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 13:12:25 +0100 Subject: [PATCH 02/45] admin locales for UserTable.vue --- admin/src/components/UserTable.vue | 23 +++++++++----------- admin/src/locales/de.json | 34 ++++++++++++++++++++++-------- admin/src/locales/en.json | 34 ++++++++++++++++++++++-------- 3 files changed, 60 insertions(+), 31 deletions(-) diff --git a/admin/src/components/UserTable.vue b/admin/src/components/UserTable.vue index 3a82663ce..3f5393412 100644 --- a/admin/src/components/UserTable.vue +++ b/admin/src/components/UserTable.vue @@ -248,21 +248,18 @@ export default { this.overlayItem = item if (bookmarkType === 'remove') { - this.overlayText.header = 'Achtung! Schöpfung löschen!' - this.overlayText.text1 = - 'Nach dem Löschen gibt es keine Möglichkeit mehr diesen Datensatz wiederherzustellen. Es wird aber der gesamte Vorgang in der Logdatei als Übersicht gespeichert.' - this.overlayText.text2 = 'Willst du die vorgespeicherte Schöpfung wirklich löschen? ' - this.overlayText.button_ok = 'Ja, Schöpfung löschen!' - this.overlayText.button_cancel = 'Nein, nicht löschen.' + this.overlayText.header = this.$t('overlay.remove.title') + this.overlayText.text1 = this.$t('overlay.remove.text') + this.overlayText.text2 = this.$t('overlay.remove.question') + this.overlayText.button_ok = this.$t('overlay.remove.yes') + this.overlayText.button_cancel = this.$t('overlay.remove.no') } if (bookmarkType === 'confirm') { - this.overlayText.header = 'Schöpfung bestätigen!' - this.overlayText.text1 = - 'Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.' - this.overlayText.text2 = - 'Willst du diese vorgespeicherte Schöpfung wirklich vollziehen und entgültig speichern?' - this.overlayText.button_ok = 'Ja, Schöpfung speichern und bestätigen!' - this.overlayText.button_cancel = 'Nein, nicht speichern.' + this.overlayText.header = this.$t('overlay.confirm.title') + this.overlayText.text1 = this.$t('overlay.confirm.text') + this.overlayText.text2 = this.$t('overlay.confirm.question') + this.overlayText.button_ok = this.$t('overlay.confirm.yes') + this.overlayText.button_cancel = this.$t('overlay.confirm.no') } }, overlayOK(bookmarkType, item) { diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index c0df181e4..bd0161707 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -1,13 +1,29 @@ { + "details": "Details", + "e_mail": "E-Mail", + "firstname": "Vorname", + "lastname": "Nachname", + "mail": "Mail", "not_open_creations": "keine offene Schöpfungen", + "open_creation": "offene Schöpfungen", "open_creations": "offene Schöpfungen", - "unregistered_emails":"Unregistrierte E-Mails", - "user_search":"User suche", - "e_mail":"E-Mail", - "firstname":"Vorname", - "lastname":"Nachname", - "open_creation":"offene Schöpfungen", - "details":"Details", - "mail":"Mail", - "transaction":"Transaktion" + "transaction": "Transaktion", + "unregistered_emails": "Unregistrierte E-Mails", + "user_search": "User suche", + "overlay" : { + "remove": { + "title":"Achtung! Schöpfung löschen!", + "text":"Nach dem Löschen gibt es keine Möglichkeit mehr diesen Datensatz wiederherzustellen. Es wird aber der gesamte Vorgang in der Logdatei als Übersicht gespeichert.", + "question":"Willst du die vorgespeicherte Schöpfung wirklich löschen?", + "yes":"Ja, Schöpfung löschen!", + "no":"Nein, nicht löschen." + }, + "confirm": { + "title":"Schöpfung bestätigen!", + "text":"Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.", + "question":"Willst du diese vorgespeicherte Schöpfung wirklich vollziehen und entgültig speichern?", + "yes":"Ja, Schöpfung speichern und bestätigen!", + "no":"Nein, nicht speichern." + } + } } diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index fa13363b4..0f384f129 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -1,13 +1,29 @@ { + "details": "Details", + "e_mail": "E-Mail", + "firstname": "Firstname", + "lastname": "Lastname", + "mail": "Mail", "not_open_creations": "No open creations", + "open_creation": "Open creations", "open_creations": "Open creations", - "unregistered_emails":"Unregistered e-mails", - "user_search":"User search", - "e_mail":"E-Mail", - "firstname":"Firstname", - "lastname":"Lastname", - "open_creation":"Open creations", - "details":"Details", - "mail":"Mail", - "transaction":"Transaction" + "transaction": "Transaction", + "unregistered_emails": "Unregistered e-mails", + "user_search": "User search", + "overlay" : { + "remove": { + "title":"Achtung! Schöpfung löschen!", + "text":"Nach dem Löschen gibt es keine Möglichkeit mehr diesen Datensatz wiederherzustellen. Es wird aber der gesamte Vorgang in der Logdatei als Übersicht gespeichert.", + "question":"Willst du die vorgespeicherte Schöpfung wirklich löschen?", + "yes":"Ja, Schöpfung löschen!", + "no":"Nein, nicht löschen." + }, + "confirm": { + "title":"Schöpfung bestätigen!", + "text":"Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.", + "question":"Willst du diese vorgespeicherte Schöpfung wirklich vollziehen und entgültig speichern?", + "yes":"Ja, Schöpfung speichern und bestätigen!", + "no":"Nein, nicht speichern." + } + } } From e7fa028d933e6a3a4ccfefdb513d1ada5d1f457a Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 13:15:42 +0100 Subject: [PATCH 03/45] translation to english from UserTable.vue locales --- admin/src/locales/en.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 0f384f129..9d0e6ac39 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -12,18 +12,18 @@ "user_search": "User search", "overlay" : { "remove": { - "title":"Achtung! Schöpfung löschen!", - "text":"Nach dem Löschen gibt es keine Möglichkeit mehr diesen Datensatz wiederherzustellen. Es wird aber der gesamte Vorgang in der Logdatei als Übersicht gespeichert.", - "question":"Willst du die vorgespeicherte Schöpfung wirklich löschen?", - "yes":"Ja, Schöpfung löschen!", - "no":"Nein, nicht löschen." + "title":"Attention! Delete creation!", + "text":"After deletion, there is no possibility to restore this data record. However, the entire process is saved in the log file as an overview.", + "question":"Do you really want to delete the pre-stored creation?", + "yes":"Yes, delete creation!", + "no":"No, do not delete." }, "confirm": { - "title":"Schöpfung bestätigen!", - "text":"Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.", - "question":"Willst du diese vorgespeicherte Schöpfung wirklich vollziehen und entgültig speichern?", - "yes":"Ja, Schöpfung speichern und bestätigen!", - "no":"Nein, nicht speichern." + "title":"Confirm creation!", + "text":"After saving, the record can no longer be changed or deleted. Please check carefully that everything is correct.", + "question":"Do you really want to carry out and finally save this pre-stored creation?", + "yes":"Yes, confirm and save creation!", + "no":"No, do not save." } } } From 964d51504c56a276d77b937b8df7ecd15a11e543 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 15:06:43 +0100 Subject: [PATCH 04/45] translation to english from CreationFormular.vue locales --- admin/src/components/CreationFormular.vue | 23 +++++++----- admin/src/locales/de.json | 14 ++++++- admin/src/locales/en.json | 46 ++++++++++++++--------- 3 files changed, 55 insertions(+), 28 deletions(-) diff --git a/admin/src/components/CreationFormular.vue b/admin/src/components/CreationFormular.vue index 9d1309cae..af966a952 100644 --- a/admin/src/components/CreationFormular.vue +++ b/admin/src/components/CreationFormular.vue @@ -1,10 +1,10 @@ diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index 04f1c9a13..09e1fa92a 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -1,6 +1,6 @@ diff --git a/admin/src/components/RowDetails.vue b/admin/src/components/RowDetails.vue index 7153870ee..319936a70 100644 --- a/admin/src/components/RowDetails.vue +++ b/admin/src/components/RowDetails.vue @@ -9,7 +9,7 @@ :icon="type === 'PageCreationConfirm' ? 'x' : 'eye-slash-fill'" aria-label="Help" > - Details verbergen von {{ row.item.firstName }} {{ row.item.lastName }} + {{ $t('hide_details') }} {{ row.item.firstName }} {{ row.item.lastName }} diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index d99c4c1d0..bf5e7ca79 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -16,6 +16,8 @@ "details": "Details", "e_mail": "E-Mail", "firstname": "Vorname", + "gradido_admin_footer":"Gradido Akademie Adminkonsole", + "hide_details":"Details verbergen von ", "lastname": "Nachname", "mail": "Mail", "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.", @@ -48,6 +50,9 @@ }, "remove": "remove", "transaction": "Transaktion", + "transactionlist": { + "title":"Alle Geschöpften Transaktionen für den User" + }, "unregistered_emails": "Unregistrierte E-Mails", "unregister_mail": { "button": "Registrierungs-Email bestätigen, jetzt senden", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 8375db2b1..721223e24 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -17,6 +17,8 @@ "e_mail": "E-Mail", "firstname": "Firstname", "lastname": "Lastname", + "hide_details":"Hide details from ", + "gradido_admin_footer":"Gradido Academy Admin Console", "mail": "Mail", "multiple_creation_text": "Please select one or more members you would like to scoop for.", "navbar": { @@ -48,6 +50,9 @@ }, "remove": "entfernen", "transaction": "Transaction", + "transactionlist": { + "title":"Alle Geschöpften Transaktionen für den User" + }, "unregistered_emails": "Unregistered e-mails", "unregister_mail": { "button": "Confirm registration email, send now", From 0ca0f49f3fbe9e79dcd4fc1ab836bce258c716f8 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 17:24:03 +0100 Subject: [PATCH 13/45] yarn locales --fix --- admin/src/locales/de.json | 6 +++--- admin/src/locales/en.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index bf5e7ca79..ed6589786 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -16,8 +16,8 @@ "details": "Details", "e_mail": "E-Mail", "firstname": "Vorname", - "gradido_admin_footer":"Gradido Akademie Adminkonsole", - "hide_details":"Details verbergen von ", + "gradido_admin_footer": "Gradido Akademie Adminkonsole", + "hide_details": "Details verbergen von ", "lastname": "Nachname", "mail": "Mail", "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.", @@ -51,7 +51,7 @@ "remove": "remove", "transaction": "Transaktion", "transactionlist": { - "title":"Alle Geschöpften Transaktionen für den User" + "title": "Alle Geschöpften Transaktionen für den User" }, "unregistered_emails": "Unregistrierte E-Mails", "unregister_mail": { diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 721223e24..81cd4a557 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -16,9 +16,9 @@ "details": "Details", "e_mail": "E-Mail", "firstname": "Firstname", + "gradido_admin_footer": "Gradido Academy Admin Console", + "hide_details": "Hide details from ", "lastname": "Lastname", - "hide_details":"Hide details from ", - "gradido_admin_footer":"Gradido Academy Admin Console", "mail": "Mail", "multiple_creation_text": "Please select one or more members you would like to scoop for.", "navbar": { @@ -51,7 +51,7 @@ "remove": "entfernen", "transaction": "Transaction", "transactionlist": { - "title":"Alle Geschöpften Transaktionen für den User" + "title": "Alle Geschöpften Transaktionen für den User" }, "unregistered_emails": "Unregistered e-mails", "unregister_mail": { From 53e25ab11913eb6a3c0c8dc1ff811de89c7f2d85 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 17:38:00 +0100 Subject: [PATCH 14/45] yarn test fixed --- admin/src/components/ConfirmRegisterMailFormular.spec.js | 5 +++-- admin/src/components/CreationFormular.spec.js | 1 + .../src/components/CreationTransactionListFormular.spec.js | 1 + admin/src/components/EditCreationFormular.spec.js | 1 + admin/src/components/NavBar.spec.js | 1 + admin/src/components/UserTable.spec.js | 6 +++++- admin/src/pages/Creation.spec.js | 1 + admin/src/pages/CreationConfirm.spec.js | 1 + admin/src/pages/Overview.spec.js | 1 + admin/src/pages/UserSearch.spec.js | 1 + 10 files changed, 16 insertions(+), 3 deletions(-) diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js index 8872128e9..178ebe097 100644 --- a/admin/src/components/ConfirmRegisterMailFormular.spec.js +++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js @@ -8,6 +8,7 @@ const toastSuccessMock = jest.fn() const toastErrorMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $apollo: { mutate: apolloMutateMock, }, @@ -53,7 +54,7 @@ describe('ConfirmRegisterMailFormular', () => { it('toasts a success message', () => { expect(toastSuccessMock).toBeCalledWith( - 'Erfolgreich senden der Confirmation Link an die E-Mail des Users! bob@baumeister.de', + 'unregister_mail.success', ) }) }) @@ -67,7 +68,7 @@ describe('ConfirmRegisterMailFormular', () => { it('toasts an error message', () => { expect(toastErrorMock).toBeCalledWith( - 'Fehler beim senden des confirmation link an den Benutzer: OUCH!', + 'unregister_mail.error', ) }) }) diff --git a/admin/src/components/CreationFormular.spec.js b/admin/src/components/CreationFormular.spec.js index 1c7dd40fc..388ab6aa9 100644 --- a/admin/src/components/CreationFormular.spec.js +++ b/admin/src/components/CreationFormular.spec.js @@ -21,6 +21,7 @@ const toastedErrorMock = jest.fn() const toastedSuccessMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $moment: jest.fn(() => { return { format: jest.fn((m) => m), diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js index 80b337268..9817d6b8f 100644 --- a/admin/src/components/CreationTransactionListFormular.spec.js +++ b/admin/src/components/CreationTransactionListFormular.spec.js @@ -53,6 +53,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ const toastedErrorMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $apollo: { query: apolloQueryMock, }, diff --git a/admin/src/components/EditCreationFormular.spec.js b/admin/src/components/EditCreationFormular.spec.js index b7b091e32..92ef20988 100644 --- a/admin/src/components/EditCreationFormular.spec.js +++ b/admin/src/components/EditCreationFormular.spec.js @@ -18,6 +18,7 @@ const stateCommitMock = jest.fn() const toastedErrorMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $moment: jest.fn(() => { return { format: jest.fn((m) => m), diff --git a/admin/src/components/NavBar.spec.js b/admin/src/components/NavBar.spec.js index ad3ed54fd..6871cb4f7 100644 --- a/admin/src/components/NavBar.spec.js +++ b/admin/src/components/NavBar.spec.js @@ -7,6 +7,7 @@ const storeDispatchMock = jest.fn() const routerPushMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $store: { state: { openCreations: 1, diff --git a/admin/src/components/UserTable.spec.js b/admin/src/components/UserTable.spec.js index 3db0131a3..e25f53015 100644 --- a/admin/src/components/UserTable.spec.js +++ b/admin/src/components/UserTable.spec.js @@ -13,8 +13,12 @@ describe('UserTable', () => { creation: [], } + const mocks = { + $t: jest.fn((t) => t), + } + const Wrapper = () => { - return mount(UserTable, { localVue, propsData }) + return mount(UserTable, { localVue, propsData, mocks }) } describe('mount', () => { diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js index 65e56ca33..073b22c0e 100644 --- a/admin/src/pages/Creation.spec.js +++ b/admin/src/pages/Creation.spec.js @@ -28,6 +28,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ const toastErrorMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $apollo: { query: apolloQueryMock, }, diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index fb59d1598..14a71bb78 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -37,6 +37,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ const apolloMutateMock = jest.fn().mockResolvedValue({}) const mocks = { + $t: jest.fn((t) => t), $store: { commit: storeCommitMock, }, diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js index b0b8dc6fb..28b7cc305 100644 --- a/admin/src/pages/Overview.spec.js +++ b/admin/src/pages/Overview.spec.js @@ -22,6 +22,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ const storeCommitMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $apollo: { query: apolloQueryMock, }, diff --git a/admin/src/pages/UserSearch.spec.js b/admin/src/pages/UserSearch.spec.js index 63fcefb5b..473b2bbdc 100644 --- a/admin/src/pages/UserSearch.spec.js +++ b/admin/src/pages/UserSearch.spec.js @@ -20,6 +20,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ const toastErrorMock = jest.fn() const mocks = { + $t: jest.fn((t) => t), $apollo: { query: apolloQueryMock, }, From bf73d6be42c3be597ca133413c58ee9723ed5bc1 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 17:39:26 +0100 Subject: [PATCH 15/45] yarn lint --fix --- admin/src/components/ConfirmRegisterMailFormular.spec.js | 8 ++------ admin/src/pages/Overview.spec.js | 1 - 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/admin/src/components/ConfirmRegisterMailFormular.spec.js b/admin/src/components/ConfirmRegisterMailFormular.spec.js index 178ebe097..705a185a3 100644 --- a/admin/src/components/ConfirmRegisterMailFormular.spec.js +++ b/admin/src/components/ConfirmRegisterMailFormular.spec.js @@ -53,9 +53,7 @@ describe('ConfirmRegisterMailFormular', () => { }) it('toasts a success message', () => { - expect(toastSuccessMock).toBeCalledWith( - 'unregister_mail.success', - ) + expect(toastSuccessMock).toBeCalledWith('unregister_mail.success') }) }) @@ -67,9 +65,7 @@ describe('ConfirmRegisterMailFormular', () => { }) it('toasts an error message', () => { - expect(toastErrorMock).toBeCalledWith( - 'unregister_mail.error', - ) + expect(toastErrorMock).toBeCalledWith('unregister_mail.error') }) }) }) diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js index 28b7cc305..b3d720d5c 100644 --- a/admin/src/pages/Overview.spec.js +++ b/admin/src/pages/Overview.spec.js @@ -32,7 +32,6 @@ const mocks = { openCreations: 2, }, }, - $t: jest.fn((t) => t), } describe('Overview', () => { From b22c4001c1bc6917a25fb18e90bec91cc905df26 Mon Sep 17 00:00:00 2001 From: ogerly Date: Tue, 28 Dec 2021 17:42:09 +0100 Subject: [PATCH 16/45] merge pull add .vscode/settings.json --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 000000000..3b6641073 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "git.ignoreLimitWarning": true +} \ No newline at end of file From e2159c7da59e4f8be47441582672aa73d15d05a6 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:01:33 +0100 Subject: [PATCH 17/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 ed6589786..72dd9aa06 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -3,7 +3,7 @@ "creation_form": { "creation_for": "Schöpfung für ", "enter_text": "Text eintragen", - "form": "Creation form", + "form": "Schöpfungsformular", "min_characters": "Mindestens 10 Zeichen eingeben", "reset": "zurücksetzen", "select_month": "Monat Auswählen", From b3c5f37960d3ed1fe7dfc33e2d81cf2e39ccf5e3 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:02:06 +0100 Subject: [PATCH 18/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 72dd9aa06..5c247f7f1 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -5,7 +5,7 @@ "enter_text": "Text eintragen", "form": "Schöpfungsformular", "min_characters": "Mindestens 10 Zeichen eingeben", - "reset": "zurücksetzen", + "reset": "Zurücksetzen", "select_month": "Monat Auswählen", "select_value": "Betrag Auswählen", "submit_creation": "Schöpfung einreichen", From 048584634883ef91ea8a87cd005e0969fcb219a6 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:02:19 +0100 Subject: [PATCH 19/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 5c247f7f1..2a29aba41 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -7,7 +7,7 @@ "min_characters": "Mindestens 10 Zeichen eingeben", "reset": "Zurücksetzen", "select_month": "Monat Auswählen", - "select_value": "Betrag Auswählen", + "select_value": "Betrag auswählen", "submit_creation": "Schöpfung einreichen", "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegen zur Bestätigung bereit", "toasted_update": "`Offene schöpfung {value} GDD) für {email} wurde geändert, liegt zur Bestätigung bereit", From fe0f11334bfd098a31b3eb4a629a4218eff7e360 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:02:48 +0100 Subject: [PATCH 20/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 2a29aba41..2850ce26d 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -9,7 +9,7 @@ "select_month": "Monat Auswählen", "select_value": "Betrag auswählen", "submit_creation": "Schöpfung einreichen", - "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegen zur Bestätigung bereit", + "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, liegt zur Bestätigung bereit", "update_creation": "Update Schöpfung" }, From 831862b584f32b3fcb6a05976c38cd1504956ac3 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:02:57 +0100 Subject: [PATCH 21/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 81cd4a557..2b3a219c7 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -24,7 +24,7 @@ "navbar": { "logout": "Logout", "multi_creation": "Multiple creation", - "open_creation": "open creations", + "open_creation": "Open creations", "overview": "Overview", "user_search": "User search", "wallet": "Wallet" From 2ceaa8a9db9552a8a6596c7524fe102c7c95117f Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:03:13 +0100 Subject: [PATCH 22/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 2b3a219c7..368ed1d1c 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -48,7 +48,7 @@ "yes": "Yes, delete creation!" } }, - "remove": "entfernen", + "remove": "Remove", "transaction": "Transaction", "transactionlist": { "title": "Alle Geschöpften Transaktionen für den User" From 980367af5df9eb430fbcf8297690a2f7a3e88adf Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:03:50 +0100 Subject: [PATCH 23/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 368ed1d1c..5ea773a79 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -51,7 +51,7 @@ "remove": "Remove", "transaction": "Transaction", "transactionlist": { - "title": "Alle Geschöpften Transaktionen für den User" + "title": "All creation-transactions for the user" }, "unregistered_emails": "Unregistered e-mails", "unregister_mail": { From 4c029b6fcffb36b4ec47f9a93a489ca2add59b78 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:04:05 +0100 Subject: [PATCH 24/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 5ea773a79..2fcccbe7c 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -30,7 +30,7 @@ "wallet": "Wallet" }, "not_open_creations": "No open creations", - "open_creation": "Open creations", + "open_creation": "Open creation", "open_creations": "Open creations", "overlay": { "confirm": { From 508429f778c0bcc7716beea5b2e8d53442a9ad86 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:04:13 +0100 Subject: [PATCH 25/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 2850ce26d..98fb925b0 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -6,7 +6,7 @@ "form": "Schöpfungsformular", "min_characters": "Mindestens 10 Zeichen eingeben", "reset": "Zurücksetzen", - "select_month": "Monat Auswählen", + "select_month": "Monat auswählen", "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", From 9167656934620e4180bea2e51e5c474a6e190184 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:04:34 +0100 Subject: [PATCH 26/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 98fb925b0..15c500f5c 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -10,7 +10,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_update": "`Offene schöpfung {value} GDD) für {email} wurde geändert, 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": "Update Schöpfung" }, "details": "Details", From 9f7278228c025dc231127529d6396d170456151d Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:05:19 +0100 Subject: [PATCH 27/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 15c500f5c..1a7824ab0 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -24,7 +24,7 @@ "navbar": { "logout": "Logout", "multi_creation": "Mehrfachschöpfung", - "open_creation": "offene Schöpfungen", + "open_creation": "Offene Schöpfungen", "overview": "Übersicht", "user_search": "Usersuche", "wallet": "Wallet" From bc83b8ea7ebeee76b7de1b8989f1d6da8e92fe19 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:05:36 +0100 Subject: [PATCH 28/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 1a7824ab0..4d86a6668 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -22,7 +22,7 @@ "mail": "Mail", "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.", "navbar": { - "logout": "Logout", + "logout": "Abmelden", "multi_creation": "Mehrfachschöpfung", "open_creation": "Offene Schöpfungen", "overview": "Übersicht", From 1eed166977eca78160a84cf73a87aec92fbada42 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:05:49 +0100 Subject: [PATCH 29/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 4d86a6668..2db86dd42 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -26,7 +26,7 @@ "multi_creation": "Mehrfachschöpfung", "open_creation": "Offene Schöpfungen", "overview": "Übersicht", - "user_search": "Usersuche", + "user_search": "Nutzersuche", "wallet": "Wallet" }, "not_open_creations": "keine offene Schöpfungen", From 4b68e3007bbf2f511708fdc5908b2ea8271490a7 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 00:06:10 +0100 Subject: [PATCH 30/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 2db86dd42..f4e205dff 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -29,7 +29,7 @@ "user_search": "Nutzersuche", "wallet": "Wallet" }, - "not_open_creations": "keine offene Schöpfungen", + "not_open_creations": "Keine offenen Schöpfungen", "open_creation": "offene Schöpfung", "open_creations": "offene Schöpfungen", "overlay": { From 8802156e93e3d5e4f47047e706b14c5f34e95bc1 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:03:02 +0100 Subject: [PATCH 31/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 f4e205dff..e7ac4c3bf 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -11,7 +11,7 @@ "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": "Update Schöpfung" + "update_creation": "Schöpfung aktualisieren" }, "details": "Details", "e_mail": "E-Mail", From fc53b06b22ac475756839cf497c9fc4f31413bbd Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:05:57 +0100 Subject: [PATCH 32/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 e7ac4c3bf..d200d74c0 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -30,7 +30,7 @@ "wallet": "Wallet" }, "not_open_creations": "Keine offenen Schöpfungen", - "open_creation": "offene Schöpfung", + "open_creation": "Offene Schöpfung", "open_creations": "offene Schöpfungen", "overlay": { "confirm": { From 090401c3f91d7bf2746f77701b946e835d320070 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:06:16 +0100 Subject: [PATCH 33/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 d200d74c0..3aaa05a5a 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -31,7 +31,7 @@ }, "not_open_creations": "Keine offenen Schöpfungen", "open_creation": "Offene Schöpfung", - "open_creations": "offene Schöpfungen", + "open_creations": "Offene Schöpfungen", "overlay": { "confirm": { "no": "Nein, nicht speichern.", From 351b76a7214d8de63a40818a17fa13c3b39958f2 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:06:28 +0100 Subject: [PATCH 34/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 3aaa05a5a..96a04be30 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -48,7 +48,7 @@ "yes": "Ja, Schöpfung löschen!" } }, - "remove": "remove", + "remove": "Entfernen", "transaction": "Transaktion", "transactionlist": { "title": "Alle Geschöpften Transaktionen für den User" From 6b42fe4f38b13279a38659ad2e2f732831723ec0 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:06:49 +0100 Subject: [PATCH 35/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 96a04be30..de118f885 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -51,7 +51,7 @@ "remove": "Entfernen", "transaction": "Transaktion", "transactionlist": { - "title": "Alle Geschöpften Transaktionen für den User" + "title": "Alle geschöpften Transaktionen für den Nutzer" }, "unregistered_emails": "Unregistrierte E-Mails", "unregister_mail": { From ff73ac19ab3a3fd6622f640455d950ed2480c92d Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:07:11 +0100 Subject: [PATCH 36/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 de118f885..72a5c4c50 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -56,7 +56,7 @@ "unregistered_emails": "Unregistrierte E-Mails", "unregister_mail": { "button": "Registrierungs-Email bestätigen, jetzt senden", - "error": "Fehler beim senden des confirmation link an den Benutzer: {message}", + "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}", "info": "Email bestätigen, wiederholt senden an:", "success": "Erfolgreich senden der Confirmation Link an die E-Mail des Users! ({email})", "text": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet." From ac377585d5192c4c9cd28643de674eb2c1e00f51 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:07:25 +0100 Subject: [PATCH 37/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 72a5c4c50..0b0032722 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -58,7 +58,7 @@ "button": "Registrierungs-Email bestätigen, jetzt senden", "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}", "info": "Email bestätigen, wiederholt senden an:", - "success": "Erfolgreich senden der Confirmation Link an die E-Mail des Users! ({email})", + "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})", "text": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet." }, "user_search": "User suche" From ff9325e1e2fd14f639c136cffcf99fae712d1105 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:07:38 +0100 Subject: [PATCH 38/45] Update admin/src/locales/de.json Co-authored-by: Moriz Wahl --- 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 0b0032722..890038c73 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -61,5 +61,5 @@ "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})", "text": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet." }, - "user_search": "User suche" + "user_search": "Nutzer-Suche" } From ff33ac68d39666352aa13727188018527e40d8ba Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:08:13 +0100 Subject: [PATCH 39/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 2fcccbe7c..b2e1d4eb7 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -10,7 +10,7 @@ "select_value": "Select amount", "submit_creation": "Submit creation", "toasted": "Open creation ({value} GDD) for {email} has been saved and are ready for confirmation.", - "toasted_update": "Open creation {value} GDD) for {email} has been changed, ready for confirmation.", + "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.", "update_creation": "Creation update" }, "details": "Details", From cae8ee3463bfc20dac406a9f7532112a15205f33 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:08:26 +0100 Subject: [PATCH 40/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 b2e1d4eb7..a9b77704f 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -1,5 +1,5 @@ { - "bookmark": "merken", + "bookmark": "Remember", "creation_form": { "creation_for": "Creation for ", "enter_text": "Enter text", From 965d5400c5c1762fbe9ca6c958f5b142f7659983 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:08:48 +0100 Subject: [PATCH 41/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 a9b77704f..d99f8bdeb 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -5,7 +5,7 @@ "enter_text": "Enter text", "form": "Creation form", "min_characters": "Enter at least 10 characters", - "reset": "reset", + "reset": "Reset", "select_month": "Select month", "select_value": "Select amount", "submit_creation": "Submit creation", From 406ccf937ae660ef63ef20c20ed2a8b4bf55cc16 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 11:21:13 +0100 Subject: [PATCH 42/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 d99f8bdeb..8b81cdbd0 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -9,7 +9,7 @@ "select_month": "Select month", "select_value": "Select amount", "submit_creation": "Submit creation", - "toasted": "Open creation ({value} GDD) for {email} has been saved and are ready for confirmation.", + "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" }, From 0d1ed1a87678620c81c9ff725aaa164233cbb05d Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 29 Dec 2021 12:08:57 +0100 Subject: [PATCH 43/45] reviews processed and changes made --- admin/src/locales/de.json | 4 ++-- admin/src/locales/en.json | 4 ++-- admin/src/pages/UserSearch.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 890038c73..8d1fb6dca 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -17,9 +17,9 @@ "e_mail": "E-Mail", "firstname": "Vorname", "gradido_admin_footer": "Gradido Akademie Adminkonsole", - "hide_details": "Details verbergen von ", + "hide_details": "Details verbergen von", "lastname": "Nachname", - "mail": "Mail", + "confirmed": "bestätigt", "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.", "navbar": { "logout": "Abmelden", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 8b81cdbd0..3daa269f3 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -17,9 +17,9 @@ "e_mail": "E-Mail", "firstname": "Firstname", "gradido_admin_footer": "Gradido Academy Admin Console", - "hide_details": "Hide details from ", + "hide_details": "Hide details from", "lastname": "Lastname", - "mail": "Mail", + "confirmed": "confirmed", "multiple_creation_text": "Please select one or more members you would like to scoop for.", "navbar": { "logout": "Logout", diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index 5b2ea2180..2c8b289e0 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -66,7 +66,7 @@ export default { }, }, { key: 'show_details', label: this.$t('details') }, - { key: 'confirm_mail', label: this.$t('mail') }, + { key: 'confirm_mail', label: this.$t('confirmed') }, { key: 'transactions_list', label: this.$t('transaction') }, ], searchResult: [], From 90339ea80796306b33957ce6c760554e94de9631 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 29 Dec 2021 12:10:36 +0100 Subject: [PATCH 44/45] yarn lint, yarn locales fixed --- admin/src/locales/de.json | 2 +- admin/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index 8d1fb6dca..b2f0e427d 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -1,5 +1,6 @@ { "bookmark": "bookmark", + "confirmed": "bestätigt", "creation_form": { "creation_for": "Schöpfung für ", "enter_text": "Text eintragen", @@ -19,7 +20,6 @@ "gradido_admin_footer": "Gradido Akademie Adminkonsole", "hide_details": "Details verbergen von", "lastname": "Nachname", - "confirmed": "bestätigt", "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.", "navbar": { "logout": "Abmelden", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 3daa269f3..54f81261d 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -1,5 +1,6 @@ { "bookmark": "Remember", + "confirmed": "confirmed", "creation_form": { "creation_for": "Creation for ", "enter_text": "Enter text", @@ -19,7 +20,6 @@ "gradido_admin_footer": "Gradido Academy Admin Console", "hide_details": "Hide details from", "lastname": "Lastname", - "confirmed": "confirmed", "multiple_creation_text": "Please select one or more members you would like to scoop for.", "navbar": { "logout": "Logout", From 762110bc940233e0075daf00ad7b68e063ae75a0 Mon Sep 17 00:00:00 2001 From: Alexander Friedland Date: Wed, 29 Dec 2021 12:59:25 +0100 Subject: [PATCH 45/45] Update admin/src/locales/en.json Co-authored-by: Moriz Wahl --- 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 54f81261d..398f4b5f6 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -20,7 +20,7 @@ "gradido_admin_footer": "Gradido Academy Admin Console", "hide_details": "Hide details from", "lastname": "Lastname", - "multiple_creation_text": "Please select one or more members you would like to scoop for.", + "multiple_creation_text": "Please select one or more members for which you would like to perform creations.", "navbar": { "logout": "Logout", "multi_creation": "Multiple creation",