From ab37ebb00b7b07443ea219455c60676f9599b6e6 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sun, 9 Aug 2020 15:37:35 +0300 Subject: [PATCH] Update confimation messages for rejecting accounts --- src/lang/en.js | 7 ++++--- src/views/users/components/ModerationDropdown.vue | 8 ++++---- src/views/users/components/MultipleUsersMenu.vue | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/lang/en.js b/src/lang/en.js index 76ef91e4..2008aec8 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -229,13 +229,14 @@ export default { revokeRightConfirmation: 'Are you sure you want to revoke {right} rights from all selected users?', activateMultipleUsersConfirmation: 'Are you sure you want to activate accounts of all selected users?', deactivateMultipleUsersConfirmation: 'Are you sure you want to deactivate accounts of all selected users?', - deleteUsersConfirmation: 'Are you sure you want to delete this account? This action cannot be undone.', - deleteMultipleUsersConfirmation: 'Are you sure you want to delete accounts of all selected users?', + deleteUserConfirmation: 'Are you sure you want to delete this account? This action cannot be undone.', + rejectAccountConfirmation: 'Are you sure you want to reject this account? This account will be deleted and it cannot be undone.', + deleteMultipleUsersConfirmation: 'Are you sure you want to delete accounts of all selected users? This action cannot be undone.', addTagForMultipleUsersConfirmation: 'Are you sure you want to apply tag to all selected users?', removeTagFromMultipleUsersConfirmation: 'Are you sure you want to remove tag from all selected users?', requirePasswordResetConfirmation: 'Are you sure you want to require password reset for all selected users?', approveAccountsConfirmation: 'Are you sure you want to approve accounts for all selected users?', - rejectAccountsConfirmation: 'Are you sure you want to reject accounts for all selected users?', + rejectAccountsConfirmation: 'Are you sure you want to reject accounts for all selected users? These accounts will be deleted and it cannot be undone.', confirmAccountsConfirmation: 'Are you sure you want to confirm emails for all selected users?', resendEmailConfirmation: 'Are you sure you want to resend confirmation email for all selected users?', mailerMustBeEnabled: 'To require user\'s password reset you must enable mailer.', diff --git a/src/views/users/components/ModerationDropdown.vue b/src/views/users/components/ModerationDropdown.vue index b8312b4c..4ae3d7f2 100644 --- a/src/views/users/components/ModerationDropdown.vue +++ b/src/views/users/components/ModerationDropdown.vue @@ -155,7 +155,7 @@ export default { }, handleDeletion(user) { this.$confirm( - this.$t('users.deleteUsersConfirmation'), + this.$t('users.deleteUserConfirmation'), { confirmButtonText: 'Delete', cancelButtonText: 'Cancel', @@ -174,9 +174,9 @@ export default { }, handleAccountRejection(user) { this.$confirm( - this.$t('users.deleteUsersConfirmation'), + this.$t('users.rejectAccountConfirmation'), { - confirmButtonText: 'Delete', + confirmButtonText: 'Reject', cancelButtonText: 'Cancel', type: 'warning' }).then(() => { @@ -184,7 +184,7 @@ export default { }).catch(() => { this.$message({ type: 'info', - message: 'Delete canceled' + message: 'Reject canceled' }) }) }, diff --git a/src/views/users/components/MultipleUsersMenu.vue b/src/views/users/components/MultipleUsersMenu.vue index 652436a5..976d2913 100644 --- a/src/views/users/components/MultipleUsersMenu.vue +++ b/src/views/users/components/MultipleUsersMenu.vue @@ -325,7 +325,7 @@ export default { rejectAccountsForMultipleUsers() { const { remove } = this.mappers() this.confirmMessage( - this.$t('users.deleteMultipleUsersConfirmation'), + this.$t('users.rejectAccountsConfirmation'), remove ) },