IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-01 12:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
ogerly 2022-09-22 10:06:19 +02:00
parent 592d2c300e
commit 1bcfe14d70
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/components/ContributionLinkList.spec.js
View File

@ -95,7 +95,7 @@ describe('ContributionLinkList', () => {
})
it('toasts a success message', () => {
expect(toastSuccessSpy).toBeCalledWith('TODO: request message deleted ')
expect(toastSuccessSpy).toBeCalledWith('contributionLink.deleted')
})
})

2
admin/src/components/ContributionLinkList.vue
View File

@ -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) => {

5
admin/src/locales/de.json
View File

@ -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",

5
admin/src/locales/en.json
View File

@ -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",