imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stregthen bound 3PID warning dialog

Browse source 
This tweaks the bound 3PID text and adds danger styling.

Fixes https://github.com/vector-im/riot-web/issues/10750
This commit is contained in:
J. Ryan Stinnett 2019-09-06 13:43:21 +01:00
parent 11a5fca702
commit 3ad88604cc
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/views/settings/SetIdServer.js
View file

@ -260,17 +260,21 @@ export default class SetIdServer extends React.Component {
const boundThreepids = threepids.filter(tp => tp.bound); const boundThreepids = threepids.filter(tp => tp.bound);
let message; let message;
let danger = false;
if (boundThreepids.length) { if (boundThreepids.length) {
message = _t( message = _t(
"You are currently sharing email addresses or phone numbers on the identity " + "You are still <b>sharing your personal data</b> on the identity " +
"server <idserver />. You will need to reconnect to <idserver2 /> to stop " + "server <idserver />. <br /> <br /> " +
"sharing them.", {}, "We recommend that you remove your email addresses and phone numbers " +
"from the identity server before disconnecting.", {},
{ {
idserver: sub => <b>{abbreviateUrl(this.state.currentClientIdServer)}</b>, idserver: sub => <b>{abbreviateUrl(this.state.currentClientIdServer)}</b>,
// XXX: https://github.com/vector-im/riot-web/issues/9086 b: sub => <b>{sub}</b>,
idserver2: sub => <b>{abbreviateUrl(this.state.currentClientIdServer)}</b>, br: () => <br />,
}, },
); );
danger = true;
button = _t("Disconnect anyway");
} else { } else {
message = unboundMessage; message = unboundMessage;
} }
@ -280,6 +284,8 @@ export default class SetIdServer extends React.Component {
title, title,
description: message, description: message,
button, button,
cancelButton: _t("Go back"),
danger,
}); });
return finished; return finished;
} }

5
src/i18n/strings/en_EN.json
View file

@ -563,7 +563,9 @@
"Disconnect identity server": "Disconnect identity server", "Disconnect identity server": "Disconnect identity server",
"Disconnect from the identity server <idserver />?": "Disconnect from the identity server <idserver />?", "Disconnect from the identity server <idserver />?": "Disconnect from the identity server <idserver />?",
"Disconnect": "Disconnect", "Disconnect": "Disconnect",
"You are currently sharing email addresses or phone numbers on the identity server <idserver />. You will need to reconnect to <idserver2 /> to stop sharing them.": "You are currently sharing email addresses or phone numbers on the identity server <idserver />. You will need to reconnect to <idserver2 /> to stop sharing them.", "You are still <b>sharing your personal data</b> on the identity server <idserver />. <br /> <br /> We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.": "You are still <b>sharing your personal data</b> on the identity server <idserver />. <br /> <br /> We recommend that you remove your email addresses and phone numbers from the identity server before disconnecting.",
"Disconnect anyway": "Disconnect anyway",
"Go back": "Go back",
"Identity Server (%(server)s)": "Identity Server (%(server)s)", "Identity Server (%(server)s)": "Identity Server (%(server)s)",
"You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.", "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using <server></server> to discover and be discoverable by existing contacts you know. You can change your identity server below.",
"If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.", "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.": "If you don't want to use <server /> to discover and be discoverable by existing contacts you know, enter another identity server below.",
@ -1287,7 +1289,6 @@
"If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.", "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
"To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.", "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.": "To help avoid duplicate issues, please <existingIssuesLink>view existing issues</existingIssuesLink> first (and add a +1) or <newIssueLink>create a new issue</newIssueLink> if you can't find it.",
"Report bugs & give feedback": "Report bugs & give feedback", "Report bugs & give feedback": "Report bugs & give feedback",
"Go back": "Go back",
"Room Settings - %(roomName)s": "Room Settings - %(roomName)s", "Room Settings - %(roomName)s": "Room Settings - %(roomName)s",
"Failed to upgrade room": "Failed to upgrade room", "Failed to upgrade room": "Failed to upgrade room",
"The room upgrade could not be completed": "The room upgrade could not be completed", "The room upgrade could not be completed": "The room upgrade could not be completed",