From acb22f4fe5c3cbd347b570f7c47ac7797503256c Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Mon, 13 Jul 2020 17:02:20 +0100 Subject: [PATCH] Replace references to riot.im --- src/async-components/structures/CompatibilityView.tsx | 4 ++-- src/async-components/structures/ErrorView.tsx | 4 ++-- src/i18n/strings/en_EN.json | 2 +- src/vector/app.tsx | 4 ++-- src/vector/mobile_guide/index.js | 2 +- src/vector/static/incompatible-browser.html | 4 ++-- src/vector/static/unable-to-load.html | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index b42c3f7f..7bcd4774 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -97,8 +97,8 @@ const CompatibilityView: React.FC = ({ onAccept }) => {

- - { _t("Go to Riot.im") } + + { _t("Go to element.io") }

diff --git a/src/async-components/structures/ErrorView.tsx b/src/async-components/structures/ErrorView.tsx index 3f0cca2d..acde7ac0 100644 --- a/src/async-components/structures/ErrorView.tsx +++ b/src/async-components/structures/ErrorView.tsx @@ -48,8 +48,8 @@ const ErrorView: React.FC = ({title, messages}) => {

- - { _t("Go to Riot.im") } + + { _t("Go to element.io") }

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 5dd43a4b..117892ec 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -27,7 +27,7 @@ "Please install Chrome, Firefox, or Safari for the best experience.": "Please install Chrome, Firefox, or Safari for the best experience.", "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.", "I understand the risks and wish to continue": "I understand the risks and wish to continue", - "Go to Riot.im": "Go to Riot.im", + "Go to element.io": "Go to element.io", "Failed to start": "Failed to start", "Welcome to Element": "Welcome to Element", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralised, encrypted chat & collaboration powered by [matrix]", diff --git a/src/vector/app.tsx b/src/vector/app.tsx index 5dcee9a7..445a37ba 100644 --- a/src/vector/app.tsx +++ b/src/vector/app.tsx @@ -86,11 +86,11 @@ function onNewScreen(screen: string) { // // If we're in electron, we should never pass through a file:// URL otherwise // the identity server will try to 302 the browser to it, which breaks horribly. -// so in that instance, hardcode to use riot.im/app for now instead. +// so in that instance, hardcode to use app.element.io for now instead. function makeRegistrationUrl(params: object) { let url; if (window.location.protocol === "vector:") { - url = 'https://riot.im/app/#/register'; + url = 'https://app.element.io/#/register'; } else { url = ( window.location.protocol + '//' + diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js index 105aba1f..f174d777 100644 --- a/src/vector/mobile_guide/index.js +++ b/src/vector/mobile_guide/index.js @@ -93,7 +93,7 @@ async function initPage() { if (hsUrl !== 'https://matrix.org/') { document.getElementById('configure_riot_button').href = - "https://riot.im/config/config?hs_url=" + encodeURIComponent(hsUrl) + + "https://app.element.io/config/config?hs_url=" + encodeURIComponent(hsUrl) + "&is_url=" + encodeURIComponent(isUrl); document.getElementById('step1_heading').innerHTML= '1: Install the app'; document.getElementById('step2_container').style.display = 'block'; diff --git a/src/vector/static/incompatible-browser.html b/src/vector/static/incompatible-browser.html index 69287949..7caee204 100644 --- a/src/vector/static/incompatible-browser.html +++ b/src/vector/static/incompatible-browser.html @@ -482,8 +482,8 @@ diff --git a/src/vector/static/unable-to-load.html b/src/vector/static/unable-to-load.html index c91e51a8..c1eb0f9f 100644 --- a/src/vector/static/unable-to-load.html +++ b/src/vector/static/unable-to-load.html @@ -189,8 +189,8 @@