From f19e07a6f37690b4bfb265c2ae1f505c636b9e41 Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Wed, 20 Apr 2022 12:26:21 +0200 Subject: [PATCH 1/2] Improve text of account deactivation dialog --- .../views/dialogs/DeactivateAccountDialog.tsx | 46 +++++-------------- src/i18n/strings/en_EN.json | 14 ++++-- 2 files changed, 20 insertions(+), 40 deletions(-) diff --git a/src/components/views/dialogs/DeactivateAccountDialog.tsx b/src/components/views/dialogs/DeactivateAccountDialog.tsx index a505d5e647d..dbdc3b3639a 100644 --- a/src/components/views/dialogs/DeactivateAccountDialog.tsx +++ b/src/components/views/dialogs/DeactivateAccountDialog.tsx @@ -86,7 +86,7 @@ export default class DeactivateAccountDialog extends React.Component
-

{ _t( - "This will make your account permanently unusable. " + - "You will not be able to log in, and no one will be able to re-register the same " + - "user ID. " + - "This will cause your account to leave all rooms it is participating in, and it " + - "will remove your account details from your identity server. " + - "This action is irreversible.", - {}, - { b: (sub) => { sub } }, - ) }

- -

{ _t( - "Deactivating your account does not by default cause us to forget messages you " + - "have sent. " + - "If you would like us to forget your messages, please tick the box below.", - {}, - { b: (sub) => { sub } }, - ) }

- -

{ _t( - "Message visibility in Matrix is similar to email. " + - "Our forgetting your messages means that messages you have sent will not be shared " + - "with any new or unregistered users, but registered users who already have access " + - "to these messages will still have access to their copy.", - ) }

+

{ _t("Confirm that you would like to deactivate your account. If you proceed:") }

+
    +
  • { _t("You will not be able to reactivate your account") }
    • +
  • { _t("You will no longer be able to log in") }
    • +
  • { _t("No one will be able to reuse your username (MXID), including you: this username will remain unavailable") }
    • +
  • { _t("You will leave all rooms and DMs that you are in") }
    • +
  • { _t("You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number") }
    • +
+

{ _t("Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?") }

@@ -238,20 +222,12 @@ export default class DeactivateAccountDialog extends React.Component - { _t( - "Please forget all messages I have sent when my account is deactivated " + - "(Warning: this will cause future users to see an incomplete view " + - "of conversations)", - {}, - { b: (sub) => { sub } }, - ) } + { _t("Hide my messages from new joiners") }

- { error } { auth }
-
); diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index dcf6772ce80..5204401e674 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -2479,14 +2479,18 @@ "Confirm your account deactivation by using Single Sign On to prove your identity.": "Confirm your account deactivation by using Single Sign On to prove your identity.", "Are you sure you want to deactivate your account? This is irreversible.": "Are you sure you want to deactivate your account? This is irreversible.", "Confirm account deactivation": "Confirm account deactivation", - "To continue, please enter your password:": "To continue, please enter your password:", + "To continue, please enter your account password:": "To continue, please enter your account password:", "There was a problem communicating with the server. Please try again.": "There was a problem communicating with the server. Please try again.", "Server did not require any authentication": "Server did not require any authentication", "Server did not return valid authentication information.": "Server did not return valid authentication information.", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.", - "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.", - "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.", - "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)", + "Confirm that you would like to deactivate your account. If you proceed:": "Confirm that you would like to deactivate your account. If you proceed:", + "You will not be able to reactivate your account": "You will not be able to reactivate your account", + "You will no longer be able to log in": "You will no longer be able to log in", + "No one will be able to reuse your username (MXID), including you: this username will remain unavailable": "No one will be able to reuse your username (MXID), including you: this username will remain unavailable", + "You will leave all rooms and DMs that you are in": "You will leave all rooms and DMs that you are in", + "You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number": "You will be removed from the identity server: your friends will no longer be able to find you with your email or phone number", + "Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?": "Your old messages will still be visible to people who received them, just like emails you sent in the past. Would you like to hide your sent messages from people who join rooms in the future?", + "Hide my messages from new joiners": "Hide my messages from new joiners", "Room": "Room", "Send custom timeline event": "Send custom timeline event", "Explore room state": "Explore room state", From 0d82204995ef2122edf1a7b9761d92098fde200d Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski Date: Wed, 20 Apr 2022 13:34:23 +0200 Subject: [PATCH 2/2] Reduce spacing of deactivate account dialog --- res/css/views/dialogs/_DeactivateAccountDialog.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/res/css/views/dialogs/_DeactivateAccountDialog.scss b/res/css/views/dialogs/_DeactivateAccountDialog.scss index 192917b2d00..8941afaf39c 100644 --- a/res/css/views/dialogs/_DeactivateAccountDialog.scss +++ b/res/css/views/dialogs/_DeactivateAccountDialog.scss @@ -18,10 +18,6 @@ limitations under the License. margin-bottom: 30px; } -.mx_DeactivateAccountDialog .mx_DeactivateAccountDialog_input_section { - margin-top: 60px; -} - .mx_DeactivateAccountDialog .mx_DeactivateAccountDialog_input_section .mx_Field { width: 300px; }