IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1255 from gradido/1230-Details-für-wiederholte-Email-bestaetigen-versenden

Browse Source 
1230 details für wiederholte email bestaetigen versenden
This commit is contained in:
Alexander Friedland 2022-01-07 13:31:39 +01:00 committed by GitHub
commit 784cfdecf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/src/components/ConfirmRegisterMailFormular.spec.js
View File

@ -19,6 +19,7 @@ const mocks = {
} }
const propsData = { const propsData = {
checked: false,
email: 'bob@baumeister.de', email: 'bob@baumeister.de',
dateLastSend: '', dateLastSend: '',
} }

10
admin/src/components/ConfirmRegisterMailFormular.vue
View File

@ -1,9 +1,9 @@
<template> <template>
<div class="component-confirm-register-mail"> <div class="component-confirm-register-mail">
<div class="shadow p-3 mb-5 bg-white rounded"> <div class="shadow p-3 mb-5 bg-white rounded">
<div class="h5"> <div v-if="checked">{{ $t('unregister_mail.text_true', { date: dateLastSend }) }}</div>
{{ $t('unregister_mail.text', { date: dateLastSend, mail: email }) }} <div v-else>
</div> {{ $t('unregister_mail.text_false', { date: dateLastSend, mail: email }) }}
<!-- Using components --> <!-- Using components -->
<b-input-group :prepend="$t('unregister_mail.info')" class="mt-3"> <b-input-group :prepend="$t('unregister_mail.info')" class="mt-3">
@ -16,6 +16,7 @@
</b-input-group> </b-input-group>
</div> </div>
</div> </div>
</div>
</template> </template>
<script> <script>
import { sendActivationEmail } from '../graphql/sendActivationEmail' import { sendActivationEmail } from '../graphql/sendActivationEmail'
@ -23,6 +24,9 @@ import { sendActivationEmail } from '../graphql/sendActivationEmail'
export default { export default {
name: 'ConfirmRegisterMail', name: 'ConfirmRegisterMail',
props: { props: {
checked: {
type: Boolean,
},
email: { email: {
type: String, type: String,
}, },

1
admin/src/components/UserTable.vue
View File

@ -107,6 +107,7 @@
</template> </template>
<template #show-register-mail> <template #show-register-mail>
<confirm-register-mail-formular <confirm-register-mail-formular
:checked="row.item.emailChecked"
:email="row.item.email" :email="row.item.email"
:dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm')," :dateLastSend="$moment().subtract(1, 'month').format('dddd, DD.MMMM.YYYY HH:mm'),"
/> />

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

@ -59,7 +59,8 @@
"error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}", "error": "Fehler beim Senden des Bestätigungs-Links an den Benutzer: {message}",
"info": "Email bestätigen, wiederholt senden an:", "info": "Email bestätigen, wiederholt senden an:",
"success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})", "success": "Erfolgreiches Senden des Bestätigungs-Links an die E-Mail des Nutzers! ({email})",
"text": " Die letzte Email wurde am <b>{date} Uhr</b> an das Mitglied ({mail}) gesendet." "text_false": " Die letzte Email wurde am {date} Uhr an das Mitglied ({mail}) gesendet.",
"text_true": " Die Email wurde am {date} Uhr bestätigt."
}, },
"user_search": "Nutzer-Suche" "user_search": "Nutzer-Suche"
} }

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

@ -59,7 +59,8 @@
"error": "Error sending the confirmation link to the user: {message}", "error": "Error sending the confirmation link to the user: {message}",
"info": "Confirm email, send repeatedly to:", "info": "Confirm email, send repeatedly to:",
"success": "Successfully send the confirmation link to the user's email! ({email})", "success": "Successfully send the confirmation link to the user's email! ({email})",
"text": " The last email was sent to the member ({mail}) on <b>{date} clock</b>." "text_false": "The last email was sent to the member ({mail}) on {date} clock.",
"text_true": "The email was confirmed on {date} clock."
}, },
"user_search": "User search" "user_search": "User search"
} }