diff --git a/packages/client/public/locales/en/Confirm.json b/packages/client/public/locales/en/Confirm.json index 4654adc81f..750a8b2c46 100644 --- a/packages/client/public/locales/en/Confirm.json +++ b/packages/client/public/locales/en/Confirm.json @@ -4,11 +4,11 @@ "ConfirmOwnerPortalSuccessMessage": "DocSpace owner has been successfully changed. You will be redirected in 10 seconds.", "ConfirmOwnerPortalTitle": "Please confirm you want to change the DocSpace owner to {{newOwner}}.", "CurrentNumber": "Your current mobile phone number", - "DeleteProfileBtn": "Delete my account", - "DeleteProfileConfirmation": "Attention! You are about to delete your account.", - "DeleteProfileConfirmationInfo": "By clicking \"Delete my account\" you agree with our <1>Privacy policy.", - "DeleteProfileSuccessMessage": "Your account has been successfully deleted.", - "DeleteProfileSuccessMessageInfo": "See our <1>Privacy policy to learn more about deleting your account and the data associated with it.", + "DeleteProfileBtn": "Disable my account", + "DeleteProfileConfirmation": "Attention! You are about to disable your account.", + "DeleteProfileConfirmationInfo": "By clicking \"Disable my account\" you agree with our <1>Privacy policy.", + "DeleteProfileSuccessMessage": "Your account is disabled", + "DeleteProfileSuccessMessageInfo": "Your DocSpace account is successfully disabled. The DocSpace owner or admin can permanently delete your disabled account. Please check our <1>Privacy policy to learn more about deleting your account and associated data.", "EmailAndPasswordCopiedToClipboard": "Email and password copied to clipboard", "EnterAppCodeDescription": "Enter 6-digit generated code from your app. If you don't have access to your phone, use the backup codes.", "EnterAppCodeTitle": "Enter code from authentication app", diff --git a/packages/client/public/locales/en/DeleteProfileEverDialog.json b/packages/client/public/locales/en/DeleteProfileEverDialog.json index 353e6eb5ef..87e840fff3 100644 --- a/packages/client/public/locales/en/DeleteProfileEverDialog.json +++ b/packages/client/public/locales/en/DeleteProfileEverDialog.json @@ -2,7 +2,9 @@ "ActionCannotBeUndone": "The selected disabled users will be removed from DocSpace. This action cannot be undone.", "CannotReassignFiles": "If you delete multiple users at once, you cannot reassign their files to other users.", "DeleteGroupUsersSuccessMessage": "Users have been successfully deleted.", - "DeleteMyDocumentsUser": "All personal files and folders in My documents section of this user will be permanently deleted.", + "DeleteMyDocumentsUser": "Personal data, all files and folders in the Documents and Trash sections of this user will be permanently deleted.", + "DeletePersonalData": "Personal data, all personal files and folders in the Documents and Trash sections* of the selected users will be permanently deleted. Files and folders of the selected users kept in common sections* such as rooms will remain in DocSpace.", + "DeletePersonalDataApplicable": "*Applicable for the selected users who have such files and folders.", "DeleteReassignDescriptionUser": "{{warningMessageMyDocuments}} Rooms created by this user and documents stored in these rooms will be reassigned automatically to an admin performing the deletion: {{userPerformedDeletion}} ({{userYou}}). Reassign data manually to choose another destination user for reassignment.", "DeleteUser": "Delete user", "DeleteUserMessage": "{{userCaption}} {{user}} will be deleted. This action cannot be undone.", diff --git a/packages/client/public/locales/en/DeleteSelfProfileDialog.json b/packages/client/public/locales/en/DeleteSelfProfileDialog.json index d88eaa3d99..69bb45e3ba 100644 --- a/packages/client/public/locales/en/DeleteSelfProfileDialog.json +++ b/packages/client/public/locales/en/DeleteSelfProfileDialog.json @@ -1,5 +1,5 @@ { - "DeleteOwnerRestrictionText": "Being an owner of this DocSpace, you must transfer the ownership to another user before you can delete your account. Please choose a new owner to proceed.", - "DeleteProfileInfo": "Send the profile deletion instructions to the email address", - "DeleteProfileTitle": "Delete profile" + "DeleteOwnerRestrictionText": "Being an owner of this DocSpace, you must transfer the ownership to another user before you can disable your account. Please choose a new owner to proceed.", + "DeleteProfileInfo": "Send the instructions for account disabling to the email address", + "DeleteProfileTitle": "Disable account" } diff --git a/packages/client/public/locales/en/PeopleTranslations.json b/packages/client/public/locales/en/PeopleTranslations.json index ab520e883a..3bb9437790 100644 --- a/packages/client/public/locales/en/PeopleTranslations.json +++ b/packages/client/public/locales/en/PeopleTranslations.json @@ -2,7 +2,7 @@ "AccountLoginType": "Account login type", "AddMembers": "Add members", "CreateGroup": "Create group", - "DeleteSelfProfile": "Delete profile", + "DeleteSelfProfile": "Disable account", "DisabledEmployeeStatus": "Disabled", "DisableUserButton": "Disable", "EditGroup": "Edit group", diff --git a/packages/client/src/components/dialogs/DeleteProfileEverDialog/sub-components/BodyComponent.js b/packages/client/src/components/dialogs/DeleteProfileEverDialog/sub-components/BodyComponent.js index 0169f2b28c..436574eaf4 100644 --- a/packages/client/src/components/dialogs/DeleteProfileEverDialog/sub-components/BodyComponent.js +++ b/packages/client/src/components/dialogs/DeleteProfileEverDialog/sub-components/BodyComponent.js @@ -74,12 +74,18 @@ const BodyComponent = (props) => { <> {t("ActionCannotBeUndone")} {t("PleaseNote")} + + {t("DeletePersonalData")} + {t("CannotReassignFiles")} {t("ToBeAbleToReassignData")} + + {t("DeletePersonalDataApplicable")} + ); } diff --git a/packages/client/src/pages/Confirm/sub-components/profileRemove.js b/packages/client/src/pages/Confirm/sub-components/profileRemove.js index ec1a07fc4d..8f1faf6d38 100644 --- a/packages/client/src/pages/Confirm/sub-components/profileRemove.js +++ b/packages/client/src/pages/Confirm/sub-components/profileRemove.js @@ -74,7 +74,9 @@ const ProfileRemoveForm = (props) => { ns="Confirm" t={t} > - See our + Your DocSpace account is successfully disabled. The DocSpace + owner or admin can permanently delete your disabled account. + Please check our { > Privacy policy - to learn more about deleting your account and the data - associated with it. + to learn more about deleting your account and associated data. @@ -119,7 +120,7 @@ const ProfileRemoveForm = (props) => { ns="Confirm" t={t} > - By clicking \"Delete my account\" you agree with our Privacy + By clicking \"Disable my account\" you agree with our Privacy policy