Merge branch 'develop_tchap' into feat/minimal_branding_and_config

tchapgouv · Mar 22, 2022 · 09076aa · 09076aa
2 parents 2399371 + 6eced36
commit 09076aa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 50 deletions.
diff --git 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": "Matrix Internes Preprod"
         },
         "m.identity_server": {
-            "base_url": "https://vector.im"
+            "base_url": "https://matrix.i.tchap.gouv.fr"
         }
     },
     "disable_custom_urls": true,
@@ -31,7 +31,7 @@
     "default_theme": "custom-Tchap",
     "roomDirectory": {
         "servers": [
-            "matrix.org"
+            "i.tchap.gouv.fr"
         ]
     },
     "piwik": {

diff --git 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

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
@@ -29,5 +29,7 @@
     "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Decentralised, encrypted chat &amp; 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
@@ -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."
 }