From bbe5254074057c980cf7c6437b239244a8fc0218 Mon Sep 17 00:00:00 2001 From: Calev Eliacheff Date: Mon, 21 Mar 2022 15:10:02 +0100 Subject: [PATCH 1/8] Config using matrix dev servers --- config.sample.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.sample.json b/config.sample.json index 95de1f97c4..a3e0c0941b 100644 --- a/config.sample.json +++ b/config.sample.json @@ -1,11 +1,11 @@ { "default_server_config": { "m.homeserver": { - "base_url": "https://matrix-client.matrix.org", - "server_name": "matrix.org" + "base_url": "https://matrix.i.tchap.gouv.fr", + "server_name": "tchap.gouv.fr" }, "m.identity_server": { - "base_url": "https://vector.im" + "base_url": "https://matrix.i.tchap.gouv.fr" } }, "disable_custom_urls": false, From bfde8201df0beccf3f979b20b315a967d996f17e Mon Sep 17 00:00:00 2001 From: Calev Eliacheff Date: Mon, 21 Mar 2022 15:21:59 +0100 Subject: [PATCH 2/8] Cange room directory url --- config.sample.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sample.json b/config.sample.json index a3e0c0941b..4b2c19e482 100644 --- a/config.sample.json +++ b/config.sample.json @@ -31,7 +31,7 @@ "default_theme": "light", "roomDirectory": { "servers": [ - "matrix.org" + "i.tchap.gouv.fr" ] }, "piwik": { From f3749c92f75e56450e08d320decc2bce437e1ab5 Mon Sep 17 00:00:00 2001 From: Calev Eliacheff Date: Tue, 22 Mar 2022 08:59:01 +0100 Subject: [PATCH 3/8] Change server label --- config.sample.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sample.json b/config.sample.json index 4b2c19e482..26afea7389 100644 --- a/config.sample.json +++ b/config.sample.json @@ -2,7 +2,7 @@ "default_server_config": { "m.homeserver": { "base_url": "https://matrix.i.tchap.gouv.fr", - "server_name": "tchap.gouv.fr" + "server_name": "Matrix Tchap Dev" }, "m.identity_server": { "base_url": "https://matrix.i.tchap.gouv.fr" From 78081523801bdfd1a45d2574424190e95d016b2c Mon Sep 17 00:00:00 2001 From: Calev Eliacheff Date: Tue, 22 Mar 2022 09:00:02 +0100 Subject: [PATCH 4/8] Change server label --- config.sample.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sample.json b/config.sample.json index 26afea7389..9e35758e5f 100644 --- a/config.sample.json +++ b/config.sample.json @@ -2,7 +2,7 @@ "default_server_config": { "m.homeserver": { "base_url": "https://matrix.i.tchap.gouv.fr", - "server_name": "Matrix Tchap Dev" + "server_name": "Matrix Internes Preprod" }, "m.identity_server": { "base_url": "https://matrix.i.tchap.gouv.fr" From ef7b4086e688da9e39de51c966e89c665e66b108 Mon Sep 17 00:00:00 2001 From: Estelle Comment Date: Tue, 22 Mar 2022 14:04:08 +0100 Subject: [PATCH 5/8] Restrict to two languages, fr and en --- scripts/copy-res.js | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 8d91092fdb..bca93afc5b 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -11,51 +11,8 @@ const loaderUtils = require("loader-utils"); // This could readily be automated, but it's nice to explicitly // control when new languages are available. const INCLUDE_LANGS = [ - {'value': 'bg', 'label': 'Български'}, - {'value': 'ca', 'label': 'Català'}, - {'value': 'cs', 'label': 'čeština'}, - {'value': 'da', 'label': 'Dansk'}, - {'value': 'de_DE', 'label': 'Deutsch'}, - {'value': 'el', 'label': 'Ελληνικά'}, {'value': 'en_EN', 'label': 'English'}, - {'value': 'en_US', 'label': 'English (US)'}, - {'value': 'eo', 'label': 'Esperanto'}, - {'value': 'es', 'label': 'Español'}, - {'value': 'et', 'label': 'Eesti'}, - {'value': 'eu', 'label': 'Euskara'}, - {'value': 'fi', 'label': 'Suomi'}, - {'value': 'fr', 'label': 'Français'}, - {'value': 'gl', 'label': 'Galego'}, - {'value': 'he', 'label': 'עברית'}, - {'value': 'hi', 'label': 'हिन्दी'}, - {'value': 'hu', 'label': 'Magyar'}, - {'value': 'id', 'label': 'Bahasa Indonesia'}, - {'value': 'is', 'label': 'íslenska'}, - {'value': 'it', 'label': 'Italiano'}, - {'value': 'ja', 'label': '日本語'}, - {'value': 'kab', 'label': 'Taqbaylit'}, - {'value': 'ko', 'label': '한국어'}, - {'value': 'lt', 'label': 'Lietuvių'}, - {'value': 'lv', 'label': 'Latviešu'}, - {'value': 'nb_NO', 'label': 'Norwegian Bokmål'}, - {'value': 'nl', 'label': 'Nederlands'}, - {'value': 'nn', 'label': 'Norsk Nynorsk'}, - {'value': 'pl', 'label': 'Polski'}, - {'value': 'pt', 'label': 'Português'}, - {'value': 'pt_BR', 'label': 'Português do Brasil'}, - {'value': 'ru', 'label': 'Русский'}, - {'value': 'sk', 'label': 'Slovenčina'}, - {'value': 'sq', 'label': 'Shqip'}, - {'value': 'sr', 'label': 'српски'}, - {'value': 'sv', 'label': 'Svenska'}, - {'value': 'te', 'label': 'తెలుగు'}, - {'value': 'th', 'label': 'ไทย'}, - {'value': 'tr', 'label': 'Türkçe'}, - {'value': 'uk', 'label': 'українська мова'}, - {'value': 'vi', 'label': 'Tiếng Việt'}, - {'value': 'vls', 'label': 'West-Vlaams'}, - {'value': 'zh_Hans', 'label': '简体中文'}, // simplified chinese - {'value': 'zh_Hant', 'label': '繁體中文'}, // traditional chinese + {'value': 'fr', 'label': 'Français'} ]; // cpx includes globbed parts of the filename in the destination, but excludes From 7c01b6ae81c5e075b94094c1b1b43bd074a57f8f Mon Sep 17 00:00:00 2001 From: Estelle Comment Date: Tue, 22 Mar 2022 14:04:35 +0100 Subject: [PATCH 6/8] Translate "username" by "email" --- src/i18n/strings/en_EN.json | 4 +++- src/i18n/strings/fr.json | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 24cdd0fc3d..dc2b7fb633 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -29,5 +29,7 @@ "Decentralised, encrypted chat & collaboration powered by [matrix]": "Decentralised, encrypted chat & collaboration powered by [matrix]", "Sign In": "Sign In", "Create Account": "Create Account", - "Explore rooms": "Explore rooms" + "Explore rooms": "Explore rooms", + "Username": "Email", + "Username_comments": "We use Email to login in Tchap. The Login code accepts both username and email. So the simplest change for us to force login by email is to just rename the Username field to Email." } diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 032ad0528c..18f7eb07a7 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -3,7 +3,7 @@ "powered by Matrix": "propulsé par Matrix", "Unknown device": "Appareil inconnu", "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.", - "Welcome to Element": "Bienvenue sur Element", + "Welcome to Element": "Bienvenue sur Element AAAAA", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]", "Sign In": "Se connecter", "Create Account": "Créer un compte", @@ -36,5 +36,7 @@ "Use %(brand)s on mobile": "Utiliser %(brand)s sur téléphone", "Switch to space by number": "Afficher un espace par son numéro", "Next recently visited room or community": "Prochain salon ou communauté récemment visité", - "Previous recently visited room or community": "Salon ou communauté précédemment visité" + "Previous recently visited room or community": "Salon ou communauté précédemment visité", + "Username": "E-mail", + "Username_comments": "We use E-mail to login in Tchap. The Login code accepts both username and email. So the simplest change for us to force login by email is to just rename the Username field to Email." } From 3aaa8692b6bca7f2eb115561485c794322fd541e Mon Sep 17 00:00:00 2001 From: Estelle Comment Date: Tue, 22 Mar 2022 14:07:30 +0100 Subject: [PATCH 7/8] Block alternative ways of logging in, restrict to username/email --- config.sample.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sample.json b/config.sample.json index 9e35758e5f..03b8dbeb90 100644 --- a/config.sample.json +++ b/config.sample.json @@ -11,7 +11,7 @@ "disable_custom_urls": false, "disable_guests": false, "disable_login_language_selector": false, - "disable_3pid_login": false, + "disable_3pid_login": true, "brand": "Element", "integrations_ui_url": "https://scalar.vector.im/", "integrations_rest_url": "https://scalar.vector.im/api", From b19f04b49eee4b487946a2c3164ec744af0c1f02 Mon Sep 17 00:00:00 2001 From: Estelle Comment Date: Tue, 22 Mar 2022 14:09:11 +0100 Subject: [PATCH 8/8] Remove debug things --- src/i18n/strings/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 18f7eb07a7..365101fc9f 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -3,7 +3,7 @@ "powered by Matrix": "propulsé par Matrix", "Unknown device": "Appareil inconnu", "You need to be using HTTPS to place a screen-sharing call.": "Vous devez utiliser HTTPS pour effectuer un appel avec partage d’écran.", - "Welcome to Element": "Bienvenue sur Element AAAAA", + "Welcome to Element": "Bienvenue sur Element", "Decentralised, encrypted chat & collaboration powered by [matrix]": "Messagerie et collaboration décentralisées et chiffrées, propulsées par [matrix]", "Sign In": "Se connecter", "Create Account": "Créer un compte",