+ {_t(
+ "Disconnect from the identity server ?", {},
+ {idserver: sub => {abbreviateUrl(this.state.currentClientIdServer)}},
+ )},
+
,
+ button: _t("Disconnect"),
+ onFinished: (confirmed) => {
+ if (confirmed) {
+ this._disconnectIdServer();
+ }
+ },
+ });
+ };
+
+ _disconnectIdServer = () => {
+ MatrixClientPeg.get().setIdentityServerUrl(null);
+ localStorage.removeItem("mx_is_access_token");
+ localStorage.removeItem("mx_is_url");
+
+ let newFieldVal = '';
+ if (SdkConfig.get()['validated_server_config']['isUrl']) {
+ // Prepopulate the client's default so the user at least has some idea of
+ // a valid value they might enter
+ newFieldVal = abbreviateUrl(SdkConfig.get()['validated_server_config']['isUrl']);
+ }
+
+ this.setState({
+ busy: false,
+ error: null,
+ currentClientIdServer: MatrixClientPeg.get().getIdentityServerUrl(),
+ idServer: newFieldVal,
+ });
+ };
+
render() {
+ const AccessibleButton = sdk.getComponent('views.elements.AccessibleButton');
+ const Field = sdk.getComponent('elements.Field');
const idServerUrl = this.state.currentClientIdServer;
let sectionTitle;
let bodyText;
@@ -164,12 +207,26 @@ export default class SetIdServer extends React.Component {
} else {
sectionTitle = _t("Identity Server");
bodyText = _t(
- "You are not currently using an Identity Server. " +
+ "You are not currently using an identity server. " +
"To discover and be discoverable by existing contacts you know, " +
- "add one below",
+ "add one below.",
);
}
+ let discoSection;
+ if (idServerUrl) {
+ discoSection =
+ const threepidSection = this.state.haveIdServer ?
{_t("Email addresses")}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a925010f6e..e31a604fe3 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -540,13 +540,17 @@
"Display Name": "Display Name",
"Save": "Save",
"Identity Server URL must be HTTPS": "Identity Server URL must be HTTPS",
- "Could not connect to ID Server": "Could not connect to ID Server",
- "Not a valid ID Server (status code %(code)s)": "Not a valid ID Server (status code %(code)s)",
- "Checking Server": "Checking Server",
+ "Not a valid Identity Server (status code %(code)s)": "Not a valid Identity Server (status code %(code)s)",
+ "Could not connect to Identity Server": "Could not connect to Identity Server",
+ "Checking server": "Checking server",
+ "Disconnect Identity Server": "Disconnect Identity Server",
+ "Disconnect from the identity server ?": "Disconnect from the identity server ?",
+ "Disconnect": "Disconnect",
"Identity Server (%(server)s)": "Identity Server (%(server)s)",
"You are currently using to discover and be discoverable by existing contacts you know. You can change your identity server below.": "You are currently using to discover and be discoverable by existing contacts you know. You can change your identity server below.",
"Identity Server": "Identity Server",
- "You are not currently using an Identity Server. To discover and be discoverable by existing contacts you know, add one below": "You are not currently using an Identity Server. To discover and be discoverable by existing contacts you know, add one below",
+ "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.": "You are not currently using an identity server. To discover and be discoverable by existing contacts you know, add one below.",
+ "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.": "Disconnecting from your identity server will mean you won't be discoverable by other users and you won't be able to invite others by email or phone.",
"Change": "Change",
"Checking server": "Checking server",
"Integration manager offline or not accessible.": "Integration manager offline or not accessible.",
diff --git a/src/languageHandler.js b/src/languageHandler.js
index c1a426383b..474cd2b3cd 100644
--- a/src/languageHandler.js
+++ b/src/languageHandler.js
@@ -2,6 +2,7 @@
Copyright 2017 MTRNord and Cooperative EITA
Copyright 2017 Vector Creations Ltd.
Copyright 2019 The Matrix.org Foundation C.I.C.
+Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -102,7 +103,7 @@ function safeCounterpartTranslate(text, options) {
* @return a React component if any non-strings were used in substitutions, otherwise a string
*/
export function _t(text, variables, tags) {
- // Don't do subsitutions in counterpart. We handle it ourselves so we can replace with React components
+ // Don't do substitutions in counterpart. We handle it ourselves so we can replace with React components
// However, still pass the variables to counterpart so that it can choose the correct plural if count is given
// It is enough to pass the count variable, but in the future counterpart might make use of other information too
const args = Object.assign({ interpolate: false }, variables);
@@ -289,7 +290,7 @@ export function setLanguage(preferredLangs) {
console.log("set language to " + langToUse);
// Set 'en' as fallback language:
- if (langToUse != "en") {
+ if (langToUse !== "en") {
return getLanguage(i18nFolder + availLangs['en'].fileName);
}
}).then((langData) => {
@@ -329,13 +330,13 @@ export function getLanguagesFromBrowser() {
*/
export function getNormalizedLanguageKeys(language) {
const languageKeys = [];
- const normalizedLanguage = this.normalizeLanguageKey(language);
+ const normalizedLanguage = normalizeLanguageKey(language);
const languageParts = normalizedLanguage.split('-');
- if (languageParts.length == 2 && languageParts[0] == languageParts[1]) {
+ if (languageParts.length === 2 && languageParts[0] === languageParts[1]) {
languageKeys.push(languageParts[0]);
} else {
languageKeys.push(normalizedLanguage);
- if (languageParts.length == 2) {
+ if (languageParts.length === 2) {
languageKeys.push(languageParts[0]);
}
}
@@ -345,6 +346,9 @@ export function getNormalizedLanguageKeys(language) {
/**
* Returns a language string with underscores replaced with
* hyphens, and lowercased.
+ *
+ * @param {string} language The language string to be normalized
+ * @returns {string} The normalized language string
*/
export function normalizeLanguageKey(language) {
return language.toLowerCase().replace("_", "-");
@@ -373,8 +377,8 @@ export function pickBestLanguage(langs) {
}
{
- // Failing that, a different dialect of the same lnguage
- const closeLangIndex = normalisedLangs.find((l) => l.substr(0,2) === currentLang.substr(0,2));
+ // Failing that, a different dialect of the same language
+ const closeLangIndex = normalisedLangs.find((l) => l.substr(0, 2) === currentLang.substr(0, 2));
if (closeLangIndex > -1) return langs[closeLangIndex];
}