From 1bcfe14d702d60a8d28dc0063d5321796094c7ba Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 22 Sep 2022 10:06:19 +0200
Subject: [PATCH] resolve conflicts

---
 admin/src/components/ContributionLinkList.spec.js | 2 +-
 admin/src/components/ContributionLinkList.vue     | 2 +-
 admin/src/locales/de.json                         | 5 +++++
 admin/src/locales/en.json                         | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/admin/src/components/ContributionLinkList.spec.js b/admin/src/components/ContributionLinkList.spec.js
index 0b9d131bd..b2baf5e9b 100644
--- a/admin/src/components/ContributionLinkList.spec.js
+++ b/admin/src/components/ContributionLinkList.spec.js
@@ -95,7 +95,7 @@ describe('ContributionLinkList', () => {
         })
 
         it('toasts a success message', () => {
-          expect(toastSuccessSpy).toBeCalledWith('TODO: request message deleted ')
+          expect(toastSuccessSpy).toBeCalledWith('contributionLink.deleted')
         })
       })
 
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue
index 18c136199..48b7ce978 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLinkList.vue
@@ -87,7 +87,7 @@ export default {
                 },
               })
               .then(() => {
-                this.toastSuccess('TODO: request message deleted ')
+                this.toastSuccess(this.$t('contributionLink.deleted'))
                 this.$emit('get-contribution-links')
               })
               .catch((err) => {
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index bb010939d..5bf5163a7 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -7,7 +7,12 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
+<<<<<<< HEAD
     "deleteNow": "Automatische Schöpfung '{name}' löschen?",
+=======
+    "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
+    "deleted":"Automatische Schöpfung gelöscht!",
+>>>>>>> f12288eff (add success deleted messages)
     "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index 5f82dabe3..af66de102 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -7,7 +7,12 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
+<<<<<<< HEAD
     "deleteNow": "Delete automatic creations '{name}'?",
+=======
+    "deleteNow": "Do you really delete automatic creations '{name}'?",
+    "deleted":"Automatic creation deleted!",
+>>>>>>> f12288eff (add success deleted messages)
     "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",