From 9ea25160a1607488d01fe6aaac704994065da0d5 Mon Sep 17 00:00:00 2001 From: Mine_My Date: Mon, 11 May 2020 10:24:44 +0000 Subject: [PATCH 1/8] Translated using Weblate (Korean) Currently translated at 58.3% (21 of 36 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/ --- src/i18n/strings/ko.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index ee8889f7..44b8934f 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -9,7 +9,7 @@ "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s 용 %(browserName)s에서 연 %(appName)s", "You need to be using HTTPS to place a screen-sharing call.": "화면 공유 전화를 걸려면 HTTPS를 사용해야 합니다.", "Decentralised, encrypted chat & collaboration powered by [matrix]": "분산되고, 암호화된 대화 & [matrix]의 지원으로 협력", - "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot 설정이 올바르지 않은 JSON을 포함하고 있습니다. 문제를 해결한 후, 페이지를 새로고침하세요.", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "당신의 Riot 설정은 유효하지 않은 JSON을 포함하고 있습니다. 문제를 수정한 후, 페이지를 다시 로드해 주세요.", "The message from the parser is: %(message)s": "파서에서 온 메시지: %(message)s", "Invalid JSON": "잘못된 JSON", "Your Riot is misconfigured": "Riot이 잘못 설정됨", From 059fa6d437f66f2cf90c3aed39922ec9b2702a09 Mon Sep 17 00:00:00 2001 From: Iria_kuro Date: Mon, 11 May 2020 10:27:28 +0000 Subject: [PATCH 2/8] Translated using Weblate (Korean) Currently translated at 61.1% (22 of 36 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/ --- src/i18n/strings/ko.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 44b8934f..8cc7f6a4 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -9,7 +9,7 @@ "%(appName)s via %(browserName)s on %(osName)s": "%(osName)s 용 %(browserName)s에서 연 %(appName)s", "You need to be using HTTPS to place a screen-sharing call.": "화면 공유 전화를 걸려면 HTTPS를 사용해야 합니다.", "Decentralised, encrypted chat & collaboration powered by [matrix]": "분산되고, 암호화된 대화 & [matrix]의 지원으로 협력", - "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "당신의 Riot 설정은 유효하지 않은 JSON을 포함하고 있습니다. 문제를 수정한 후, 페이지를 다시 로드해 주세요.", + "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Riot 설정이 올바르지 않은 JSON을 포함하고 있습니다. 문제를 해결한 후, 페이지를 새로고침하세요.", "The message from the parser is: %(message)s": "파서에서 온 메시지: %(message)s", "Invalid JSON": "잘못된 JSON", "Your Riot is misconfigured": "Riot이 잘못 설정됨", @@ -21,5 +21,6 @@ "Create Account": "계정 만들기", "Need help?": "도움이 필요합니까?", "Explore rooms": "방 검색", - "Room Directory": "방 목록" + "Room Directory": "방 목록", + "Unable to load config file: please refresh the page to try again.": "설정 파일을 불러오는 데 실패: 페이지를 새로고침한 후에 다시 시도해주세요." } From cba4ed3aa2f9ef8da4fcddb25abe4e05846162a0 Mon Sep 17 00:00:00 2001 From: Iria_kuro Date: Mon, 11 May 2020 10:38:07 +0000 Subject: [PATCH 3/8] Translated using Weblate (Korean) Currently translated at 94.4% (34 of 36 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ko/ --- src/i18n/strings/ko.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 8cc7f6a4..02a0ed6d 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -22,5 +22,18 @@ "Need help?": "도움이 필요합니까?", "Explore rooms": "방 검색", "Room Directory": "방 목록", - "Unable to load config file: please refresh the page to try again.": "설정 파일을 불러오는 데 실패: 페이지를 새로고침한 후에 다시 시도해주세요." + "Unable to load config file: please refresh the page to try again.": "설정 파일을 불러오는 데 실패: 페이지를 새로고침한 후에 다시 시도해 주십시오.", + "Open user settings": "사용자 설정 열기", + "Previous/next recently visited room or community": "최근에 방문한 이전/다음 방 또는 커뮤니티", + "Riot Desktop (%(platformName)s)": "Riot 데스크탑 (%(platformName)s)", + "Go to your browser to complete Sign In": "로그인을 완료하려면 브라우저로 이동해주세요", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "Unsupported browser": "지원되지 않는 브라우저", + "Your browser can't run Riot": "사용중이신 브라우저는 Riot을 실행할 수 없습니다", + "Riot uses advanced browser features which aren't supported by your current browser.": "Riot은 현재 사용중이신 브라우저에서는 지원하지 않는 고급 브라우저 기능을 사용합니다.", + "Please install Chrome, Firefox, or Safari for the best experience.": "최상의 경험을 위해 Chrome, Firefox, 또는 Safari를 설치해주세요.", + "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": "위험하다는 것을 이해했으며 계속하고 싶습니다", + "Go to Riot.im": "Riot.im으로 가기", + "Failed to start": "시작 실패" } From 6348b17e23e67a2ccec95ba8e8412606ce15f621 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 May 2020 06:24:05 +0100 Subject: [PATCH 4/8] Pass screenAfterLogin through SSO in the callback url Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/vector/platform/ElectronPlatform.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/vector/platform/ElectronPlatform.js b/src/vector/platform/ElectronPlatform.js index 4a07e202..c362d454 100644 --- a/src/vector/platform/ElectronPlatform.js +++ b/src/vector/platform/ElectronPlatform.js @@ -448,15 +448,16 @@ export default class ElectronPlatform extends VectorBasePlatform { }); } - getSSOCallbackUrl(hsUrl: string, isUrl: string): URL { - const url = super.getSSOCallbackUrl(hsUrl, isUrl); + getSSOCallbackUrl(hsUrl: string, isUrl: string, fragmentAfterLogin: string): URL { + const url = super.getSSOCallbackUrl(hsUrl, isUrl, fragmentAfterLogin); url.protocol = "riot"; url.searchParams.set("riot-desktop-ssoid", this.ssoID); return url; } - startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas") { - super.startSingleSignOn(mxClient, loginType); // this will get intercepted by electron-main will-navigate + startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) { + // this will get intercepted by electron-main will-navigate + super.startSingleSignOn(mxClient, loginType, fragmentAfterLogin); Modal.createTrackedDialog('Electron', 'SSO', InfoDialog, { title: _t("Go to your browser to complete Sign In"), description: , From 50c4e44a14b177e1f440c96787102dbd47865588 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 14 May 2020 10:37:44 +0100 Subject: [PATCH 5/8] Add notranslate class to matrixchat to prevent translation by Google Translate Google Translate manipulates the DOM which is fundamentally incomaptible with React and causes exceptions to be thrown when React tries to manipulate the DOM based on its VDOM and the DOM methods throw exceptions because the DOM structure is not what React thinks it is. Riot has an i18n system, although it doesn't cover all strings and all languages. Fixes https://github.com/vector-im/riot-web/issues/13557 --- src/vector/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/index.html b/src/vector/index.html index 90763d4a..f93eb84a 100644 --- a/src/vector/index.html +++ b/src/vector/index.html @@ -51,7 +51,7 @@ -
+
From ac5ab3d1d3b517066e4b6babc20ffaf43f703802 Mon Sep 17 00:00:00 2001 From: langdev4u Date: Wed, 13 May 2020 09:32:48 +0000 Subject: [PATCH 6/8] Translated using Weblate (Dutch) Currently translated at 100.0% (36 of 36 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/ --- src/i18n/strings/nl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json index 032948ac..0db2894f 100644 --- a/src/i18n/strings/nl.json +++ b/src/i18n/strings/nl.json @@ -17,8 +17,8 @@ "Room Directory": "Gesprekscatalogus", "Unexpected error preparing the app. See console for details.": "Er is een onverwachte fout opgetreden bij het voorbereiden van de app. Zie de console voor details.", "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratiefout: kan slechts één van default_server_config, default_server_name, of default_hs_url opgeven.", - "Invalid configuration: no default server specified.": "Configuratiefout: geen standaardserver opgegeven.", - "Your Riot is misconfigured": "Uw Riot is onjuist geconfigureerd", + "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.", + "Your Riot is misconfigured": "Uw Riot is verkeerd geconfigureerd", "Your Riot configuration contains invalid JSON. Please correct the problem and reload the page.": "Uw Riot-configuratie bevat ongeldige JSON. Corrigeer het probleem en herlaad de pagina.", "The message from the parser is: %(message)s": "De ontleder meldt: %(message)s", "Invalid JSON": "Ongeldige JSON", From d4c9da4d8bea754ab614505f88a50e73505f298f Mon Sep 17 00:00:00 2001 From: blakhawk23 Date: Wed, 13 May 2020 08:42:34 +0000 Subject: [PATCH 7/8] Translated using Weblate (Romanian) Currently translated at 63.9% (23 of 36 strings) Translation: Riot Web/riot-web Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ro/ --- src/i18n/strings/ro.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ro.json b/src/i18n/strings/ro.json index 2847aabc..ca8d24da 100644 --- a/src/i18n/strings/ro.json +++ b/src/i18n/strings/ro.json @@ -14,5 +14,16 @@ "Create Account": "Înregistare", "Need help?": "Ai nevoie de ajutor?", "Explore rooms": "Explorează camerele", - "Room Directory": "Lista de camere" + "Room Directory": "Lista de camere", + "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Configuratie invalida: se poate specifica doar una dintre default_server_config, default_server_name, or default_hs_url.", + "Your Riot is misconfigured": "Aplicatia ta Riot e gresit configurata", + "Invalid JSON": "JSON invalid", + "Riot Desktop (%(platformName)s)": "Riot Desktop (%(platformName)s)", + "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)", + "Unsupported browser": "Acest browser nu este suportat", + "Your browser can't run Riot": "Browserul tau nu poate rula Riot", + "Please install Chrome, Firefox, or Safari for the best experience.": "Instalati va rog Chrome, Firefox, or Safari pentru o experienta mai buna.", + "I understand the risks and wish to continue": "Inteleg riscul si doresc sa continui", + "Go to Riot.im": "Acceseaza Riot.im", + "Failed to start": "Nu reuseste sa porneasca" } From 99df2d31262198dc63dc5f9f91a7bf19fa9a3d05 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 May 2020 18:46:16 +0100 Subject: [PATCH 8/8] Fix postcss order to allow mixin variables to work Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- webpack.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index ee22819d..1aa14175 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -216,10 +216,10 @@ module.exports = (env, argv) => { // Note that we use slightly different plugins for SCSS. require('postcss-import')(), + require("postcss-mixins")(), require("postcss-simple-vars")(), require("postcss-extend")(), require("postcss-nested")(), - require("postcss-mixins")(), require("postcss-easings")(), require("postcss-strip-inline-comments")(), require("postcss-hexrgba")(),