Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change dechiffrer to deverrouiller wording and simplify banner #495

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions patches/cross-signing-ui/matrix-react-sdk+3.68.0.patch
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ index fe8a24a..4611cb6 100644
</div>
);
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<IProps> = ({ failures }) => {
@@ -180,27 +180,37 @@ export const DecryptionFailureBar: React.FC<IProps> = ({ failures }) => {
)}
</React.Fragment>
);
Expand All @@ -207,6 +207,37 @@ index 7849f63..d174462 100644
}
} else if (hasOtherVerifiedDevices) {
headline = <React.Fragment>{_t("Open another device to load encrypted messages")}</React.Fragment>;
- body = (
- <React.Fragment>
- {_t(
- "This device is requesting decryption keys from your other devices. " +
- "Opening one of your other devices may speed this up.",
- )}
- </React.Fragment>
- );
- button = (
- <AccessibleButton kind="primary_outline" onClick={onDeviceListClick}>
- {_t("View your device list")}
- </AccessibleButton>
- );
+ // :TCHAP: shrink long banner
+ // body = (
+ // <React.Fragment>
+ // {_t(
+ // "This device is requesting decryption keys from your other devices. " +
+ // "Opening one of your other devices may speed this up.",
+ // )}
+ // </React.Fragment>
+ // );
+ // button = (
+ // <AccessibleButton kind="primary_outline" onClick={onDeviceListClick}>
+ // {_t("View your device list")}
+ // </AccessibleButton>
+ // );
+ // end :TCHAP:
} else {
headline = <React.Fragment>{_t("Some messages could not be decrypted")}</React.Fragment>;
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
Expand Down
2 changes: 1 addition & 1 deletion patches/patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
28 changes: 28 additions & 0 deletions src/i18n/strings/tchap_translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
}