From 556da7fe5c5fcbd3c9cd8fbfd74adfc148ec84bf Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 14 Jul 2020 15:47:03 -0600 Subject: [PATCH] Swap out Modular for EMS --- res/img/ems-logo.svg | 9 +++++++++ res/img/modular-bw-logo.svg | 18 ------------------ .../views/auth/ModularServerConfig.js | 10 +++++----- .../views/auth/ServerTypeSelector.js | 6 +++--- src/i18n/strings/en_EN.json | 5 +---- 5 files changed, 18 insertions(+), 30 deletions(-) create mode 100644 res/img/ems-logo.svg delete mode 100644 res/img/modular-bw-logo.svg diff --git a/res/img/ems-logo.svg b/res/img/ems-logo.svg new file mode 100644 index 0000000000..5ad29173cb --- /dev/null +++ b/res/img/ems-logo.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/res/img/modular-bw-logo.svg b/res/img/modular-bw-logo.svg deleted file mode 100644 index 924a587805..0000000000 --- a/res/img/modular-bw-logo.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/components/views/auth/ModularServerConfig.js b/src/components/views/auth/ModularServerConfig.js index 591c30ee7c..28fd16379d 100644 --- a/src/components/views/auth/ModularServerConfig.js +++ b/src/components/views/auth/ModularServerConfig.js @@ -23,8 +23,8 @@ import AutoDiscoveryUtils from "../../../utils/AutoDiscoveryUtils"; import * as ServerType from '../../views/auth/ServerTypeSelector'; import ServerConfig from "./ServerConfig"; -const MODULAR_URL = 'https://modular.im/services/matrix-hosting-riot' + - '?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-authentication'; +const MODULAR_URL = 'https://element.io/matrix-services' + + '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication'; // TODO: TravisR - Can this extend ServerConfig for most things? @@ -95,10 +95,10 @@ export default class ModularServerConfig extends ServerConfig { return (
-

{_t("Your Modular server")}

+

{_t("Your server")}

{_t( - "Enter the location of your Modular homeserver. It may use your own " + - "domain name or be a subdomain of modular.im.", + "Enter the location of your Element Matrix Services homeserver. It may use your own " + + "domain name or be a subdomain of element.io.", {}, { a: sub => {sub} diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js index a8a1dda968..71e7ac7f0e 100644 --- a/src/components/views/auth/ServerTypeSelector.js +++ b/src/components/views/auth/ServerTypeSelector.js @@ -22,8 +22,8 @@ import classnames from 'classnames'; import {ValidatedServerConfig} from "../../../utils/AutoDiscoveryUtils"; import {makeType} from "../../../utils/TypeUtils"; -const MODULAR_URL = 'https://modular.im/services/matrix-hosting-riot' + - '?utm_source=riot-web&utm_medium=web&utm_campaign=riot-web-authentication'; +const MODULAR_URL = 'https://element.io/matrix-services' + + '?utm_source=element-web&utm_medium=web&utm_campaign=element-web-authentication'; export const FREE = 'Free'; export const PREMIUM = 'Premium'; @@ -45,7 +45,7 @@ export const TYPES = { PREMIUM: { id: PREMIUM, label: () => _t('Premium'), - logo: () => , + logo: () => , description: () => _t('Premium hosting for organisations Learn more', {}, { a: sub => {sub} diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 21b8f2d304..11115ac4fe 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -304,8 +304,6 @@ "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s": "%(senderName)s updated a ban rule that was matching %(oldGlob)s to matching %(newGlob)s for %(reason)s", "Light": "Light", "Dark": "Dark", - "Element Light": "Element Light", - "Element Dark": "Element Dark", "You signed in to a new session without verifying it:": "You signed in to a new session without verifying it:", "Verify your other session using one of the options below.": "Verify your other session using one of the options below.", "%(name)s (%(userId)s) signed in to a new session without verifying it:": "%(name)s (%(userId)s) signed in to a new session without verifying it:", @@ -1958,8 +1956,7 @@ "Submit": "Submit", "Start authentication": "Start authentication", "Unable to validate homeserver/identity server": "Unable to validate homeserver/identity server", - "Your Modular server": "Your Modular server", - "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of modular.im.": "Enter the location of your Modular homeserver. It may use your own domain name or be a subdomain of modular.im.", + "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of element.io.": "Enter the location of your Element Matrix Services homeserver. It may use your own domain name or be a subdomain of element.io.", "Server Name": "Server Name", "Enter password": "Enter password", "Nice, strong password!": "Nice, strong password!",