Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/favico

src/i18n/strings/ko.json

@@ -21,5 +21,19 @@
     "Create Account": "계정 만들기",
     "Need help?": "도움이 필요합니까?",
     "Explore rooms": "방 검색",
-    "Room Directory": "방 목록"
+    "Room Directory": "방 목록",
+    "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 <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "최상의 경험을 위해 <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, 또는 <safariLink>Safari</safariLink>를 설치해주세요.",
+    "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": "시작 실패"
 }

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.",
+    "Invalid configuration: no default server specified.": "Configuratie ongeldig: geen standaardserver opgegeven.",
-    "Your Riot is misconfigured": "Uw Riot is onjuist geconfigureerd",
+    "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",

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 <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Instalati va rog <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> 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"
 }

src/vector/index.html

@@ -51,7 +51,7 @@
   </head>
   <body style="height: 100%; margin: 0;" data-vector-indexeddb-worker-script="<%= htmlWebpackPlugin.files.chunks['indexeddb-worker'].entry %>">
     <noscript>Sorry, Riot requires JavaScript to be enabled.</noscript> <!-- TODO: Translate this? -->
-    <section id="matrixchat" style="height: 100%; overflow: auto;"></section>
+    <section id="matrixchat" style="height: 100%; overflow: auto;" class="notranslate"></section>
     <script src="<%= htmlWebpackPlugin.files.chunks['bundle'].entry %>"></script>
 
     <!-- Legacy supporting Prefetch images -->

src/vector/platform/ElectronPlatform.js

@@ -448,15 +448,16 @@ export default class ElectronPlatform extends VectorBasePlatform {
         });
     }
 
-    getSSOCallbackUrl(hsUrl: string, isUrl: string): URL {
+    getSSOCallbackUrl(hsUrl: string, isUrl: string, fragmentAfterLogin: string): URL {
-        const url = super.getSSOCallbackUrl(hsUrl, isUrl);
+        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") {
+    startSingleSignOn(mxClient: MatrixClient, loginType: "sso" | "cas", fragmentAfterLogin: string) {
-        super.startSingleSignOn(mxClient, loginType); // this will get intercepted by electron-main will-navigate
+        // 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: <Spinner />,

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")(),