diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index be97d9c13..1e395c183 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -140,7 +140,7 @@ export default { }, onReset(event) { this.form.text = '' - this.form.memo = this.contributionMemo + this.form.memo = this.contributionMemo }, enableMemo() { this.chatOrMemo = 1 diff --git a/admin/src/graphql/getContribution.js b/admin/src/graphql/getContribution.js index bc42bceb1..34e260299 100644 --- a/admin/src/graphql/getContribution.js +++ b/admin/src/graphql/getContribution.js @@ -24,4 +24,4 @@ export const getContribution = gql` userId } } -` \ No newline at end of file +` diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json index fbfbc61d0..264029cc6 100644 --- a/admin/src/locales/de.json +++ b/admin/src/locales/de.json @@ -1,4 +1,5 @@ { + "GDD": "GDD", "all_emails": "Alle Nutzer", "back": "zurück", "change_user_role": "Nutzerrolle ändern", @@ -42,6 +43,7 @@ "createdAt": "Angelegt", "creation": "Schöpfung", "creationList": "Schöpfungsliste", + "creation_for_month": "Schöpfung für Monat", "creation_form": { "creation_for": "Aktives Grundeinkommen für", "enter_text": "Text eintragen", @@ -58,16 +60,15 @@ "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit", "update_creation": "Schöpfung aktualisieren" }, - "creation_for_month": "Schöpfung für Monat", "delete": "Löschen", + "delete_user": "Nutzer löschen", "deleted": "gelöscht", "deleted_user": "Alle gelöschten Nutzer", - "delete_user": "Nutzer löschen", "deny": "Ablehnen", + "e_mail": "E-Mail", "enabled": "aktiviert", "error": "Fehler", "expired": "abgelaufen", - "e_mail": "E-Mail", "federation": { "createdAt": "Erstellt am", "gradidoInstances": "Gradido Instanzen", @@ -88,7 +89,6 @@ "cancel": "Abbrechen", "submit": "Senden" }, - "GDD": "GDD", "help": { "help": "Hilfe", "transactionlist": { @@ -127,9 +127,9 @@ "statistic": "Statistik", "user_search": "Nutzersuche" }, - "not_open_creations": "Keine offenen Schöpfungen", "no_hashtag": "#Hashtags verbergen", "no_hashtag_tooltip": "Zeigt nur Beiträge ohne Hashtag im Text", + "not_open_creations": "Keine offenen Schöpfungen", "open": "offen", "open_creations": "Offene Schöpfungen", "overlay": { @@ -200,7 +200,6 @@ "title": "Alle geschöpften Transaktionen für den Nutzer" }, "undelete_user": "Nutzer wiederherstellen", - "unregistered_emails": "Nur unregistrierte Nutzer", "unregister_mail": { "button": "Registrierungs-Email bestätigen, jetzt senden", "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}", @@ -210,6 +209,7 @@ "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({email}) gesendet.", "text_true": " Die Email wurde bestätigt." }, + "unregistered_emails": "Nur unregistrierte Nutzer", "userRole": { "notChangeYourSelf": "Als Admin/Moderator kannst du nicht selber deine Rolle ändern.", "selectLabel": "Rolle:", diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json index 66c974ddf..dbd831bb9 100644 --- a/admin/src/locales/en.json +++ b/admin/src/locales/en.json @@ -1,4 +1,5 @@ { + "GDD": "GDD", "all_emails": "All users", "back": "back", "change_user_role": "Change user role", @@ -42,6 +43,7 @@ "createdAt": "Created at", "creation": "Creation", "creationList": "Creation list", + "creation_for_month": "Creation for month", "creation_form": { "creation_for": "Active Basic Income for", "enter_text": "Enter text", @@ -58,16 +60,15 @@ "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.", "update_creation": "Creation update" }, - "creation_for_month": "Creation for month", "delete": "Delete", + "delete_user": "Delete user", "deleted": "deleted", "deleted_user": "All deleted user", - "delete_user": "Delete user", "deny": "Reject", + "e_mail": "E-mail", "enabled": "enabled", "error": "Error", "expired": "expired", - "e_mail": "E-mail", "federation": { "createdAt": "Created At ", "gradidoInstances": "Gradido Instances", @@ -88,7 +89,6 @@ "cancel": "Cancel", "submit": "Send" }, - "GDD": "GDD", "help": { "help": "Help", "transactionlist": { @@ -127,9 +127,9 @@ "statistic": "Statistic", "user_search": "User search" }, - "not_open_creations": "No open creations", "no_hashtag": "Hide #hashtags", "no_hashtag_tooltip": "Shows only contributions without hashtag in text", + "not_open_creations": "No open creations", "open": "open", "open_creations": "Open creations", "overlay": { @@ -200,7 +200,6 @@ "title": "All creation-transactions for the user" }, "undelete_user": "Undelete User", - "unregistered_emails": "Only unregistered users", "unregister_mail": { "button": "Confirm registration email, send now", "error": "Error sending the confirmation link to the user: {message}", @@ -210,6 +209,7 @@ "text_false": "The last email was sent to the member ({email}) on {date}.", "text_true": "The email was confirmed." }, + "unregistered_emails": "Only unregistered users", "userRole": { "notChangeYourSelf": "As an admin/moderator, you cannot change your own role.", "selectLabel": "Role:", diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index d26b183e6..4842c8b3b 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -127,10 +127,7 @@ describe('CreationConfirm', () => { confirmContributionMock.mockResolvedValue({ data: { confirmContribution: true } }), ) - mockClient.setRequestHandler( - getContribution, - getContributionMock.mockResolvedValue({ data: {} }), - ) + mockClient.setRequestHandler(getContribution, getContributionMock.mockResolvedValue({ data: {} })) const Wrapper = () => { return mount(CreationConfirm, { localVue, mocks, apolloProvider }) @@ -161,7 +158,7 @@ describe('CreationConfirm', () => { expect(wrapper.find('tbody').findAll('tr')).toHaveLength(2) }) }) - + describe('actions in overlay', () => { describe('delete creation', () => { beforeEach(async () => { @@ -523,12 +520,14 @@ describe('CreationConfirm', () => { describe('reload contribution', () => { beforeEach(async () => { - await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('reload-contribution', 1) + await wrapper + .findComponent({ name: 'OpenCreationsTable' }) + .vm.$emit('reload-contribution', 1) }) it('reloaded contribution', () => { expect(getContributionMock).toBeCalledWith({ - id: 1 + id: 1, }) }) }) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 763f6e099..65a19df67 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -5,6 +5,9 @@ "1000thanks": "1000 Dank, weil du bei uns bist!", "125": "125%", "85": "85%", + "GDD": "GDD", + "GDT": "GDT", + "PersonalDetails": "Persönliche Angaben", "advanced-calculation": "Vorausberechnung", "asterisks": "****", "auth": { @@ -179,7 +182,6 @@ }, "your_amount": "Dein Betrag" }, - "GDD": "GDD", "gddKonto": "GDD Konto", "gdd_per_link": { "choose-amount": "Wähle einen Betrag aus, welchen du per Link versenden möchtest, und trage eine Nachricht ein. Die Nachricht ist ein Pflichtfeld.", @@ -214,7 +216,6 @@ "validUntil": "Gültig bis", "validUntilDate": "Der Link ist bis zum {date} gültig." }, - "GDT": "GDT", "gdt": { "calculation": "Berechnung der Gradido Transform", "contribution": "Beitrag", @@ -278,7 +279,6 @@ "settings": "Einstellungen", "transactions": "Deine Transaktionen" }, - "PersonalDetails": "Persönliche Angaben", "qrCode": "QR Code", "send_gdd": "GDD versenden", "send_per_link": "GDD versenden per Link", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index dbd355794..3d291b1f8 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -5,6 +5,9 @@ "1000thanks": "1000 thanks for being with us!", "125": "125%", "85": "85%", + "GDD": "GDD", + "GDT": "GDT", + "PersonalDetails": "Personal details", "advanced-calculation": "Advanced calculation", "asterisks": "****", "auth": { @@ -179,7 +182,6 @@ }, "your_amount": "Your amount" }, - "GDD": "GDD", "gddKonto": "GDD Konto", "gdd_per_link": { "choose-amount": "Select an amount you want to send via link and enter a message. The message is mandatory.", @@ -214,7 +216,6 @@ "validUntil": "Valid until", "validUntilDate": "The link is valid until {date}." }, - "GDT": "GDT", "gdt": { "calculation": "Calculation of Gradido Transform", "contribution": "Contribution", @@ -278,7 +279,6 @@ "settings": "Settings", "transactions": "Your transactions" }, - "PersonalDetails": "Personal details", "qrCode": "QR Code", "send_gdd": "Send GDD", "send_per_link": "Send GDD via Link", diff --git a/frontend/src/locales/es.json b/frontend/src/locales/es.json index 971c7e32f..cea9f26a8 100644 --- a/frontend/src/locales/es.json +++ b/frontend/src/locales/es.json @@ -3,6 +3,7 @@ "1000thanks": "1000 Gracias, por estar con nosotros!", "125": "125%", "85": "85%", + "GDD": "GDD", "advanced-calculation": "Proyección", "asterisks": "****", "auth": { @@ -157,7 +158,6 @@ }, "your_amount": "Tu importe" }, - "GDD": "GDD", "gdd_per_link": { "choose-amount": "Selecciona una cantidad que te gustaría enviar a través de un enlace. También puedes ingresar un mensaje. Cuando haces clic en 'Generar ahora', se crea un enlace que puedes enviar.", "copy-link": "Copiar enlace", diff --git a/frontend/src/locales/fr.json b/frontend/src/locales/fr.json index 14cb0d21c..66fcc7e21 100644 --- a/frontend/src/locales/fr.json +++ b/frontend/src/locales/fr.json @@ -5,6 +5,8 @@ "1000thanks": "1000 mercis d'être avec nous!", "125": "125%", "85": "85%", + "GDD": "GDD", + "GDT": "GDT", "advanced-calculation": "Calcul avancé", "asterisks": "****", "auth": { @@ -163,7 +165,6 @@ }, "your_amount": "Votre montant" }, - "GDD": "GDD", "gddKonto": "Compte GDD", "gdd_per_link": { "choose-amount": "Sélectionnez le montant que vous souhaitez envoyer via lien. Vous pouvez également joindre un message. Cliquez sur ‘créer maintenant’ pour établir un lien que vous pourrez partager.", @@ -197,7 +198,6 @@ "validUntil": "Valide jusqu'au", "validUntilDate": "Le lien est valide jusqu'au {date}." }, - "GDT": "GDT", "gdt": { "calculation": "Calcul de Gradido Transform", "contribution": "Contribution", diff --git a/frontend/src/locales/nl.json b/frontend/src/locales/nl.json index 553415baf..6de08baec 100644 --- a/frontend/src/locales/nl.json +++ b/frontend/src/locales/nl.json @@ -3,6 +3,7 @@ "1000thanks": "1000 dank, omdat je bij ons bent!", "125": "125%", "85": "85%", + "GDD": "GDD", "advanced-calculation": "Voorcalculatie", "asterisks": "****", "auth": { @@ -157,7 +158,6 @@ }, "your_amount": "Jouw bijdrage" }, - "GDD": "GDD", "gdd_per_link": { "choose-amount": "Kies een bedrag dat je per link versturen wil. Je kunt ook nog een bericht invullen. Wanneer je „Nu genereren“ klikt, wordt er een link gecreëerd die je kunt versturen.", "copy-link": "Link kopiëren", diff --git a/frontend/src/locales/tr.json b/frontend/src/locales/tr.json index bb2d8e078..fcf225505 100644 --- a/frontend/src/locales/tr.json +++ b/frontend/src/locales/tr.json @@ -3,6 +3,7 @@ "1000thanks": "Bizimle olduğun için 1000lerce teşekkür!", "125": "%125", "85": "%85", + "GDD": "GDD", "advanced-calculation": "Önceden hesaplama", "auth": { "left": { @@ -148,7 +149,6 @@ }, "your_amount": "Sendeki tutar" }, - "GDD": "GDD", "gdd_per_link": { "choose-amount": "Linke tıklayıp göndermek istediğiniz tutarı seç. Ayrıca bir mesaj da girebilirsin. Paylaşabileceğin bir bağlantı oluşturmak için 'Şimdi oluştur'a tıkla.", "copy-link": "Linki kopyala ",