PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #4357 from matrix-org/travis/sso-devices

Browse source 
Use singular copy when only deleting one device
This commit is contained in:
Travis Ralston 2020-04-07 12:13:38 -06:00 committed by GitHub
commit 7044eed82f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/components/views/settings/DevicesPanel.js
View file

@ -124,16 +124,21 @@ export default class DevicesPanel extends React.Component {
// pop up an interactive auth dialog // pop up an interactive auth dialog
const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog"); const InteractiveAuthDialog = sdk.getComponent("dialogs.InteractiveAuthDialog");
const numDevices = this.state.selectedDevices.length;
const dialogAesthetics = { const dialogAesthetics = {
[SSOAuthEntry.PHASE_PREAUTH]: { [SSOAuthEntry.PHASE_PREAUTH]: {
title: _t("Use Single Sign On to continue"), title: _t("Use Single Sign On to continue"),
body: _t("Confirm deleting these sessions by using Single Sign On to prove your identity."), body: _t("Confirm deleting these sessions by using Single Sign On to prove your identity.", {
count: numDevices,
}),
continueText: _t("Single Sign On"), continueText: _t("Single Sign On"),
continueKind: "primary", continueKind: "primary",
}, },
[SSOAuthEntry.PHASE_POSTAUTH]: { [SSOAuthEntry.PHASE_POSTAUTH]: {
title: _t("Confirm deleting these sessions"), title: _t("Confirm deleting these sessions"),
body: _t("Click the button below to confirm deleting these sessions."), body: _t("Click the button below to confirm deleting these sessions.", {
count: numDevices,
}),
continueText: _t("Delete sessions"), continueText: _t("Delete sessions"),
continueKind: "danger", continueKind: "danger",
}, },

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

@ -610,9 +610,11 @@
"up to date": "up to date", "up to date": "up to date",
"Your homeserver does not support session management.": "Your homeserver does not support session management.", "Your homeserver does not support session management.": "Your homeserver does not support session management.",
"Unable to load session list": "Unable to load session list", "Unable to load session list": "Unable to load session list",
"Confirm deleting these sessions by using Single Sign On to prove your identity.": "Confirm deleting these sessions by using Single Sign On to prove your identity.", "Confirm deleting these sessions by using Single Sign On to prove your identity.|other": "Confirm deleting these sessions by using Single Sign On to prove your identity.",
"Confirm deleting these sessions by using Single Sign On to prove your identity.|one": "Confirm deleting this session by using Single Sign On to prove your identity.",
"Confirm deleting these sessions": "Confirm deleting these sessions", "Confirm deleting these sessions": "Confirm deleting these sessions",
"Click the button below to confirm deleting these sessions.": "Click the button below to confirm deleting these sessions.", "Click the button below to confirm deleting these sessions.|other": "Click the button below to confirm deleting these sessions.",
"Click the button below to confirm deleting these sessions.|one": "Click the button below to confirm deleting this session.",
"Delete sessions": "Delete sessions", "Delete sessions": "Delete sessions",
"Authentication": "Authentication", "Authentication": "Authentication",
"Delete %(count)s sessions|other": "Delete %(count)s sessions", "Delete %(count)s sessions|other": "Delete %(count)s sessions",