diff --git a/src/components/structures/auth/SoftLogout.js b/src/components/structures/auth/SoftLogout.js index 8bfa458c28..585b4bfe67 100644 --- a/src/components/structures/auth/SoftLogout.js +++ b/src/components/structures/auth/SoftLogout.js @@ -21,8 +21,6 @@ import sdk from '../../../index'; import dis from '../../../dispatcher'; import * as Lifecycle from '../../../Lifecycle'; import Modal from '../../../Modal'; -import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils"; -import SdkConfig from "../../../SdkConfig"; import MatrixClientPeg from "../../../MatrixClientPeg"; import {sendLoginRequest} from "../../../Login"; import url from 'url'; @@ -53,24 +51,7 @@ export default class SoftLogout extends React.Component { constructor() { super(); - const defaultServerConfig: ValidatedServerConfig = SdkConfig.get()["validated_server_config"]; - - const hsUrl = MatrixClientPeg.get().getHomeserverUrl(); - const domainName = hsUrl === defaultServerConfig.hsUrl - ? defaultServerConfig.hsName - : MatrixClientPeg.getHomeserverName(); - - const userId = MatrixClientPeg.get().getUserId(); - const user = MatrixClientPeg.get().getUser(userId); - - const displayName = user && user.displayName !== userId - ? user.displayName - : userId.substring(1).split(':')[0]; - this.state = { - domainName, - userId, - displayName, loginView: LOGIN_VIEW.LOADING, keyBackupNeeded: true, // assume we do while we figure it out (see componentWillMount) ssoUrl: null, @@ -315,23 +296,6 @@ export default class SoftLogout extends React.Component {

{_t("You're signed out")}

-
- {_t( - "Your homeserver (%(domainName)s) admin has signed you out of your " + - "account %(displayName)s (%(userId)s).", - { - domainName: this.state.domainName, - displayName: this.state.displayName, - userId: this.state.userId, - }, - { - // XXX: It's annoying that we can't just map to two things. - // https://github.com/vector-im/riot-web/issues/9086 - 'strong1': (val) => {val}, - 'strong2': (val) => {val}, - }, - )} -

{_t("Sign in")}

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 449c6ce6bc..6a25d7f00e 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1595,7 +1595,6 @@ "Sign in and regain access to your account.": "Sign in and regain access to your account.", "You cannot sign in to your account. Please contact your homeserver admin for more information.": "You cannot sign in to your account. Please contact your homeserver admin for more information.", "You're signed out": "You're signed out", - "Your homeserver (%(domainName)s) admin has signed you out of your account %(displayName)s (%(userId)s).": "Your homeserver (%(domainName)s) admin has signed you out of your account %(displayName)s (%(userId)s).", "Clear personal data": "Clear personal data", "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.": "Warning: Your personal data (including encryption keys) is still stored on this device. Clear it if you're finished using this device, or want to sign in to another account.", "Commands": "Commands",