From 7050eebe778e1cf3bc9684bf50829cb805f6cb94 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 20 Sep 2023 03:17:45 +0000 Subject: [PATCH 1/6] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (123 of 123 strings) Translation: Element Call/element-call Translate-URL: https://translate.element.io/projects/element-call/element-call/zh_Hant/ --- public/locales/zh-Hant/app.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/public/locales/zh-Hant/app.json b/public/locales/zh-Hant/app.json index 56c70e44..815f5a1a 100644 --- a/public/locales/zh-Hant/app.json +++ b/public/locales/zh-Hant/app.json @@ -119,5 +119,7 @@ "Start video": "開始影片", "Back to recents": "回到最近的通話", "Stop video": "停止影片", - "Unmute microphone": "將麥克風取消靜音" + "Unmute microphone": "將麥克風取消靜音", + "Call not found": "找不到通話", + "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "通話現在是端對端加密的，必須從首頁建立。這有助於確保每個人都使用相同的加密金鑰。" } From d4b67015b88fcc820691f7b06e73520dd1c0f99a Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Sep 2023 10:22:48 +0100 Subject: [PATCH 2/6] Fix layout toggle on safari --- src/room/LayoutToggle.module.css | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/room/LayoutToggle.module.css b/src/room/LayoutToggle.module.css index fb95a716..3c93e742 100644 --- a/src/room/LayoutToggle.module.css +++ b/src/room/LayoutToggle.module.css @@ -24,8 +24,12 @@ limitations under the License. .toggle input { appearance: none; - /* Safari puts a margin on these, which is not removed via appearance: none */ + /* + * Safari puts a margin on these, which is not removed via appearance: none + * mobile safari also has them take up space in the DOM, so set width 0 + */ margin: 0; + width: 0; outline: none !important; } From ec11689a49429c0768783b863c68327afe5486aa Mon Sep 17 00:00:00 2001 From: Glandos Date: Wed, 20 Sep 2023 08:51:38 +0000 Subject: [PATCH 3/6] Translated using Weblate (French) Currently translated at 100.0% (123 of 123 strings) Translation: Element Call/element-call Translate-URL: https://translate.element.io/projects/element-call/element-call/fr/ --- public/locales/fr/app.json | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/public/locales/fr/app.json b/public/locales/fr/app.json index 657dec66..5232e276 100644 --- a/public/locales/fr/app.json +++ b/public/locales/fr/app.json @@ -108,5 +108,18 @@ "Sharing screen": "L’écran est partagé", "{{count, number}}|one": "{{count, number}}", "Not encrypted": "Non chiffré", - "You": "Vous" + "You": "Vous", + "Continue in browser": "Continuer dans le navigateur", + "Mute microphone": "Couper le microphone", + "Name of call": "Nom de l’appel", + "Open in the app": "Ouvrir dans l’application", + "Ready to join?": "Prêt à rejoindre ?", + "Select app": "Choisissez l’application", + "Start new call": "Démarrer un nouvel appel", + "Back to recents": "Revenir aux récents", + "Start video": "Démarrer la vidéo", + "Stop video": "Arrêter la vidéo", + "Unmute microphone": "Allumer le microphone", + "Call not found": "Appel non trouvé", + "Calls are now end-to-end encrypted and need to be created from the home page. This helps make sure everyone's using the same encryption key.": "Les appels sont maintenant chiffrés de bout-en-bout et doivent être créés depuis la page d’accueil. Cela permet d’être sûr que tout le monde utilise la même clé de chiffrement." } From a115f0530f879704c270bb7b3591dbd3f91e6fa3 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Sep 2023 13:05:11 +0100 Subject: [PATCH 4/6] Better error for browsers that don't support e2ee --- src/room/GroupCallView.tsx | 34 +++++++++++++++++++++++++++++----- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/room/GroupCallView.tsx b/src/room/GroupCallView.tsx index 809bba7d..ab96926a 100644 --- a/src/room/GroupCallView.tsx +++ b/src/room/GroupCallView.tsx @@ -17,14 +17,16 @@ limitations under the License. import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { useHistory } from "react-router-dom"; import { MatrixClient } from "matrix-js-sdk/src/client"; -import { Room } from "livekit-client"; +import { Room, isE2EESupported } from "livekit-client"; import { logger } from "matrix-js-sdk/src/logger"; import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession"; import { JoinRule, RoomMember } from "matrix-js-sdk/src/matrix"; +import { Heading, Link, Text } from "@vector-im/compound-web"; +import { useTranslation } from "react-i18next"; import type { IWidgetApiRequest } from "matrix-widget-api"; import { widget, ElementWidgetActions, JoinCallData } from "../widget"; -import { ErrorView } from "../FullScreenView"; +import { ErrorView, FullScreenView } from "../FullScreenView"; import { LobbyView } from "./LobbyView"; import { MatrixInfo } from "./VideoPreview"; import { CallEndedView } from "./CallEndedView"; @@ -284,6 +286,16 @@ export function GroupCallView({ ); const onShareClick = joinRule === JoinRule.Public ? onShareClickFn : null; + const onHomeClick = useCallback( + (ev: React.MouseEvent) => { + ev.preventDefault(); + history.push("/"); + }, + [history] + ); + + const { t } = useTranslation(); + if (e2eeEnabled && isRoomE2EE && !e2eeSharedKey) { return ( ); - } - - if (!e2eeEnabled && isRoomE2EE) { + } else if (!isE2EESupported() && isRoomE2EE) { + return ( + + Incompatible Browser + + {t( + "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117" + )} + + + {t("Home")} + + + ); + } else if (!e2eeEnabled && isRoomE2EE) { return ; } From 54e6fd4c073d75dc5866fc1e5058f11b1614171e Mon Sep 17 00:00:00 2001 From: Timo <16718859+toger5@users.noreply.github.com> Date: Wed, 20 Sep 2023 14:08:31 +0200 Subject: [PATCH 5/6] fix url by providin a last & (#1550) * fix url by prvidin a last & everything after the last & will be stripped away -> hence we loose the last param (usually confined to room...) -> going home kills the all the params which we need to fix! --------- Signed-off-by: Timo K --- src/room/AppSelectionModal.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/room/AppSelectionModal.tsx b/src/room/AppSelectionModal.tsx index 80e2871b..6a9172dc 100644 --- a/src/room/AppSelectionModal.tsx +++ b/src/room/AppSelectionModal.tsx @@ -63,7 +63,9 @@ export const AppSelectionModal: FC = ({ roomId }) => { }); const result = new URL("element://call"); - result.searchParams.set("url", url.toString()); + // Everything after the last & stripped away making us loose the last param. Most likely while removing the pwd. + // TODO fix the pwd removal function (or wherever this happens) to not delete everything after the last &. + result.searchParams.set("url", url.toString() + "&"); return result.toString(); }, [roomId, roomSharedKey]); From 5b5e62c8511783a07bd42f79829a426639b02fc7 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 20 Sep 2023 13:14:01 +0100 Subject: [PATCH 6/6] i18n --- public/locales/en-GB/app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/locales/en-GB/app.json b/public/locales/en-GB/app.json index f14af673..6dd6e72b 100644 --- a/public/locales/en-GB/app.json +++ b/public/locales/en-GB/app.json @@ -121,5 +121,6 @@ "Yes, join call": "Yes, join call", "You": "You", "You were disconnected from the call": "You were disconnected from the call", - "Your feedback": "Your feedback" + "Your feedback": "Your feedback", + "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117": "Your web browser does not support media end-to-end encryption. Supported Browsers are Chrome, Safari, Firefox >=117" }