From 095418809704f4802a888016dfb05cdf637f81b3 Mon Sep 17 00:00:00 2001 From: fkwp <5071496+fkwp@users.noreply.github.com> Date: Wed, 6 Nov 2024 15:23:38 +0000 Subject: [PATCH 1/4] Translations updates --- public/locales/de/app.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/public/locales/de/app.json b/public/locales/de/app.json index 36e7b00b..004983c2 100644 --- a/public/locales/de/app.json +++ b/public/locales/de/app.json @@ -64,6 +64,12 @@ "crypto_version": "Krypto-Version:{{version}}", "device_id": "Geräte-ID: {{id}}", "disconnected_banner": "Die Verbindung zum Server wurde getrennt.", + "e2ee_encryption_status": { + "connecting": "Verbinden...", + "key_invalid": "Der Medien-Krypto-Schlüssel für diese Person ist ungültig", + "key_missing": "Aktueller Medien-Krypto-Schlüssel für diese Person noch nicht erhalten", + "password_invalid": "Diese Person verwendet ein anderes Passwort, sodass Sie nicht mit ihr kommunizieren können" + }, "full_screen_view_description": "<0>Übermittelte Problemberichte helfen uns, Fehler zu beheben.", "full_screen_view_h1": "<0>Hoppla, etwas ist schiefgelaufen.", "group_call_loader": { @@ -90,7 +96,7 @@ "title": "An bestehendem Anruf teilnehmen?" }, "layout_grid_label": "Raster", - "layout_spotlight_label": "Rampenlicht", + "layout_spotlight_label": "Fokus", "lobby": { "ask_to_join": "Beitritt anfragen", "join_as_guest": "Als Gast beitreten", @@ -142,12 +148,12 @@ "feedback_tab_body": "Falls du auf Probleme stößt oder einfach nur eine Rückmeldung geben möchtest, sende uns bitte eine kurze Beschreibung.", "feedback_tab_description_label": "Deine Rückmeldung", "feedback_tab_h4": "Rückmeldung geben", - "feedback_tab_send_logs_label": "Debug-Protokolle einschließen", + "feedback_tab_send_logs_label": "Debug-Protokolle anhängen", "feedback_tab_thank_you": "Danke, wir haben deine Rückmeldung erhalten!", "feedback_tab_title": "Rückmeldung", "more_tab_title": "Mehr", "opt_in_description": "<0><1>Du kannst deine Zustimmung durch Abwählen dieses Kästchens zurückziehen. Falls du dich aktuell in einem Anruf befindest, wird diese Einstellung nach dem Ende des Anrufs wirksam.", - "preferences_tab_body": "Hier können zusätzliche Optionen individuell konfigurieren werden", + "preferences_tab_body": "Hier können zusätzliche Optionen für individuelle Anforderungen eingestellt werden", "preferences_tab_h4": "Einstellungen", "preferences_tab_show_hand_raised_timer_description": "Einen Timer anzeigen, wenn ein Teilnehmer seine Hand hebt", "preferences_tab_show_hand_raised_timer_label": "Dauer des Handhebens anzeigen", From f611554c31a15c1fdabcc3fa6cf9cbd4ba4713f7 Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Wed, 6 Nov 2024 15:31:31 +0000 Subject: [PATCH 2/4] Don't hide video on encryption status error (#2726) --- src/tile/MediaView.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/tile/MediaView.tsx b/src/tile/MediaView.tsx index ea148fc0..8dcc11da 100644 --- a/src/tile/MediaView.tsx +++ b/src/tile/MediaView.tsx @@ -72,11 +72,7 @@ export const MediaView = forwardRef( Date: Wed, 6 Nov 2024 16:35:29 +0100 Subject: [PATCH 3/4] Bump js-sdk (local echo fix) (#2723) --- package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 8649b12d..7fdeb803 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "livekit-client": "^2.5.7", "lodash": "^4.17.21", "loglevel": "^1.9.1", - "matrix-js-sdk": "matrix-org/matrix-js-sdk#0a29063bc9e61ee70ca43820d4bb91f6a27f1237", + "matrix-js-sdk": "matrix-org/matrix-js-sdk#e11f9defb9b9603ee2d982a8fd2b0c9577fbf48c", "matrix-widget-api": "^1.8.2", "normalize.css": "^8.0.1", "observable-hooks": "^4.2.3", diff --git a/yarn.lock b/yarn.lock index 0c9db06d..3f98879c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5990,9 +5990,9 @@ matrix-events-sdk@0.0.1: resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd" integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA== -matrix-js-sdk@matrix-org/matrix-js-sdk#0a29063bc9e61ee70ca43820d4bb91f6a27f1237: - version "34.9.0" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/0a29063bc9e61ee70ca43820d4bb91f6a27f1237" +matrix-js-sdk@matrix-org/matrix-js-sdk#e11f9defb9b9603ee2d982a8fd2b0c9577fbf48c: + version "34.10.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/e11f9defb9b9603ee2d982a8fd2b0c9577fbf48c" dependencies: "@babel/runtime" "^7.12.5" "@matrix-org/matrix-sdk-crypto-wasm" "^9.0.0" @@ -6008,7 +6008,7 @@ matrix-js-sdk@matrix-org/matrix-js-sdk#0a29063bc9e61ee70ca43820d4bb91f6a27f1237: p-retry "4" sdp-transform "^2.14.1" unhomoglyph "^1.0.6" - uuid "10" + uuid "11" matrix-widget-api@^1.8.2: version "1.9.0" @@ -8092,10 +8092,10 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -uuid@10: - version "10.0.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294" - integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ== +uuid@11: + version "11.0.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.0.2.tgz#a8d68ba7347d051e7ea716cc8dcbbab634d66875" + integrity sha512-14FfcOJmqdjbBPdDjFQyk/SdT4NySW4eM0zcG+HqbHP5jzuH56xO3J1DGhgs/cEMCfwYi3HQI1gnTO62iaG+tQ== validate-npm-package-license@^3.0.1: version "3.0.4" From bfffddfa9249cfb460bd6b4d513082e1d5e5d523 Mon Sep 17 00:00:00 2001 From: Hugh Nimmo-Smith Date: Wed, 6 Nov 2024 15:54:58 +0000 Subject: [PATCH 4/4] Fix minature => miniature spelling (#2727) --- src/reactions/RaisedHandIndicator.test.tsx | 4 ++-- src/reactions/RaisedHandIndicator.tsx | 8 ++++---- .../__snapshots__/RaisedHandIndicator.test.tsx.snap | 2 +- src/tile/MediaView.tsx | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/reactions/RaisedHandIndicator.test.tsx b/src/reactions/RaisedHandIndicator.test.tsx index fb728b48..37029afa 100644 --- a/src/reactions/RaisedHandIndicator.test.tsx +++ b/src/reactions/RaisedHandIndicator.test.tsx @@ -33,10 +33,10 @@ describe("RaisedHandIndicator", () => { ); expect(container.firstChild).toMatchSnapshot(); }); - test("renders a smaller indicator when minature is specified", () => { + test("renders a smaller indicator when miniature is specified", () => { const dateTime = new Date(); const { container } = render( - , + , ); expect(container.firstChild).toMatchSnapshot(); }); diff --git a/src/reactions/RaisedHandIndicator.tsx b/src/reactions/RaisedHandIndicator.tsx index 681e6d26..ddf66dec 100644 --- a/src/reactions/RaisedHandIndicator.tsx +++ b/src/reactions/RaisedHandIndicator.tsx @@ -27,12 +27,12 @@ const durationFormatter = new DurationFormat(undefined, { export function RaisedHandIndicator({ raisedHandTime, - minature, + miniature, showTimer, onClick, }: { raisedHandTime?: Date; - minature?: boolean; + miniature?: boolean; showTimer?: boolean; onClick?: () => void; }): ReactNode { @@ -78,12 +78,12 @@ export function RaisedHandIndicator({ const content = (
diff --git a/src/reactions/__snapshots__/RaisedHandIndicator.test.tsx.snap b/src/reactions/__snapshots__/RaisedHandIndicator.test.tsx.snap index 503631dc..bd46976c 100644 --- a/src/reactions/__snapshots__/RaisedHandIndicator.test.tsx.snap +++ b/src/reactions/__snapshots__/RaisedHandIndicator.test.tsx.snap @@ -1,6 +1,6 @@ // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html -exports[`RaisedHandIndicator > renders a smaller indicator when minature is specified 1`] = ` +exports[`RaisedHandIndicator > renders a smaller indicator when miniature is specified 1`] = `
diff --git a/src/tile/MediaView.tsx b/src/tile/MediaView.tsx index 8dcc11da..13f8663a 100644 --- a/src/tile/MediaView.tsx +++ b/src/tile/MediaView.tsx @@ -114,7 +114,7 @@ export const MediaView = forwardRef( )}