diff --git a/patches/cross-signing-ui/matrix-react-sdk+3.68.0.patch b/patches/cross-signing-ui/matrix-react-sdk+3.68.0.patch index 86ab6f84a..eeb894c02 100644 --- a/patches/cross-signing-ui/matrix-react-sdk+3.68.0.patch +++ b/patches/cross-signing-ui/matrix-react-sdk+3.68.0.patch @@ -184,10 +184,10 @@ index fe8a24a..4611cb6 100644 ); diff --git a/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx b/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx -index 7849f63..d174462 100644 +index 7849f63..b393746 100644 --- a/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx +++ b/node_modules/matrix-react-sdk/src/components/views/rooms/DecryptionFailureBar.tsx -@@ -180,11 +180,19 @@ export const DecryptionFailureBar: React.FC = ({ failures }) => { +@@ -180,27 +180,37 @@ export const DecryptionFailureBar: React.FC = ({ failures }) => { )} ); @@ -207,6 +207,37 @@ index 7849f63..d174462 100644 } } else if (hasOtherVerifiedDevices) { headline = {_t("Open another device to load encrypted messages")}; +- body = ( +- +- {_t( +- "This device is requesting decryption keys from your other devices. " + +- "Opening one of your other devices may speed this up.", +- )} +- +- ); +- button = ( +- +- {_t("View your device list")} +- +- ); ++ // :TCHAP: shrink long banner ++ // body = ( ++ // ++ // {_t( ++ // "This device is requesting decryption keys from your other devices. " + ++ // "Opening one of your other devices may speed this up.", ++ // )} ++ // ++ // ); ++ // button = ( ++ // ++ // {_t("View your device list")} ++ // ++ // ); ++ // end :TCHAP: + } else { + headline = {_t("Some messages could not be decrypted")}; + body = ( diff --git a/node_modules/matrix-react-sdk/src/toasts/SetupEncryptionToast.ts b/node_modules/matrix-react-sdk/src/toasts/SetupEncryptionToast.ts index 3b60705..aeeaee0 100644 --- a/node_modules/matrix-react-sdk/src/toasts/SetupEncryptionToast.ts diff --git a/patches/patches.json b/patches/patches.json index a55736666..a8f0441d5 100644 --- a/patches/patches.json +++ b/patches/patches.json @@ -163,7 +163,7 @@ ] }, "remove-thread-buttons": { - "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/472; ", + "github-issue": "https://github.com/tchapgouv/tchap-web-v4/issues/472", "package": "matrix-react-sdk", "files": [ "src/components/views/context_menus/MessageContextMenu.tsx", diff --git a/src/i18n/strings/tchap_translations.json b/src/i18n/strings/tchap_translations.json index 05a5ec93e..9f4f7e443 100644 --- a/src/i18n/strings/tchap_translations.json +++ b/src/i18n/strings/tchap_translations.json @@ -761,5 +761,33 @@ "You will not be able to access old undecryptable messages, but resetting your keys will allow you to receive new messages.": { "fr": "Pour éviter la perte de vos messages, vous pouvez désormais activer cette nouvelle fonctionnalité Tchap dans les paramètres de sécurité", "en": "To prevent the loss of your messages, you can now activate this new Tchap feature in the security settings" + }, + "Resend key requests": { + "fr": "Renvoyer une demande", + "en": "Resend key requests" + }, + "Open another device to load encrypted messages": { + "fr": "Utiliser un autre appareil pour déverrouiller vos messages", + "en": "Open another device to unlock messages" + }, + "Unable to decrypt message": { + "fr": "Impossible de déverrouiller le message", + "en": "Unable to unlock message" + }, + "Decrypting messages…": { + "fr": "Déverrouillage des messages…", + "end": "Unlocking messages…" + }, + "Please wait as we try to decrypt your messages. This may take a few moments.": { + "fr": "Veuillez patienter pendant que nous essayons de déverrouiller vos messages. Cela peut prendre un peu de temps.", + "en": "Please wait as we try to unlock your messages. This may take a few moments." + }, + "Some messages could not be decrypted": { + "fr": "Certains messages n’ont pas pu être déverrouillés", + "en": "Some messages could not be unlocked" + }, + "Unfortunately, there are no other verified devices to request decryption keys from. Signing in and verifying other devices may help avoid this situation in the future.": { + "fr": "Malheureusement, il n’y a aucun autre appareil vérifié qui puisse déverrouiller vos messages. La connexion et la vérification depuis d’autres appareils pourraient éviter ce genre de souci à l’avenir.", + "en": "Unfortunately, there are no other verified devices to unlock your messages. Signing in and verifying other devices may help avoid this situation in the future." } }