From a0bfe3779e7f00bb8c66ce62560a2776d9a7c95b Mon Sep 17 00:00:00 2001 From: yostyle Date: Mon, 4 Mar 2024 22:35:27 +0100 Subject: [PATCH 1/3] Update UTD message --- library/ui-strings/src/main/res/values-fr/strings.xml | 2 +- library/ui-strings/src/main/res/values-fr/strings_tchap.xml | 1 - library/ui-strings/src/main/res/values/strings.xml | 2 +- library/ui-strings/src/main/res/values/strings_tchap.xml | 1 - .../room/detail/timeline/factory/EncryptedItemFactory.kt | 6 +++--- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml index d1f7e83164..b4199470f3 100644 --- a/library/ui-strings/src/main/res/values-fr/strings.xml +++ b/library/ui-strings/src/main/res/values-fr/strings.xml @@ -1527,7 +1527,7 @@ Vous ne pouvez pas accéder à ce message car l’envoyeur n’a pas confiance en votre appareil Impossible d’accéder à ce message car vous avez été bloqué par l’envoyeur À cause du chiffrement de bout en bout, vous pouvez avoir besoin d’attendre l’arrivée du message de quelqu’un car les clés Tchap ne vous ont pas été correctement envoyées. - Message verrouillé : ouvrez ${app_name} sur un autre appareil pour récupérer vos messages. + Déchiffrement en cours… Vous n’avez pas accès à ce message Vous avez bien changé les paramètres du salon Sujet diff --git a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml index be48bdd199..7d15c1b9b6 100644 --- a/library/ui-strings/src/main/res/values-fr/strings_tchap.xml +++ b/library/ui-strings/src/main/res/values-fr/strings_tchap.xml @@ -36,7 +36,6 @@ Votre destinataire a quitté le salon ou refusé votre invitation. Vous ne pouvez pas lui envoyer de message. Utilisateur trouvé Réinitialiser le mot de passe - Sinon, consultez la FAQ. Externe diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index 7bb92dfeb1..e368b4c0fb 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -2811,7 +2811,7 @@ Set avatar You cannot access this message - Locked message: please open ${app_name} on another device to retrieve your messages. + Decryption in progress… Due to end-to-end encryption, you might need to wait for someone\'s message to arrive because the encryption keys were not properly sent to you. You cannot access this message because you have been blocked by the sender You cannot access this message because your session is not trusted by the sender diff --git a/library/ui-strings/src/main/res/values/strings_tchap.xml b/library/ui-strings/src/main/res/values/strings_tchap.xml index 1df688e27c..099393bc84 100644 --- a/library/ui-strings/src/main/res/values/strings_tchap.xml +++ b/library/ui-strings/src/main/res/values/strings_tchap.xml @@ -36,7 +36,6 @@ Your recipient has left the room or has refused your invite. You cannot send him a message. Discovered user Reset password - Otherwise, open the FAQ. External diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt index 13fcfa189e..cedc23dce8 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/EncryptedItemFactory.kt @@ -99,10 +99,10 @@ class EncryptedItemFactory @Inject constructor( else -> { // Tchap: Add faq link in unable to decrypt error span { - val faq = stringProvider.getString(R.string.tchap_notice_crypto_unable_to_decrypt_faq) - text = "${stringProvider.getString(R.string.notice_crypto_unable_to_decrypt_friendly)} $faq" + val learnMore = stringProvider.getString(R.string.action_learn_more) + text = "${stringProvider.getString(R.string.notice_crypto_unable_to_decrypt_friendly)} $learnMore" .toSpannable() - .tappableMatchingText(faq, object : ClickableSpan() { + .tappableMatchingText(learnMore, object : ClickableSpan() { override fun onClick(widget: View) { openUrlInExternalBrowser(widget.context, TCHAP_FAQ_UTD_URL) } From ea2a463124c3931f572f5b4d8071049f1f8e4048 Mon Sep 17 00:00:00 2001 From: yostyle Date: Mon, 4 Mar 2024 22:38:25 +0100 Subject: [PATCH 2/3] Add changelog --- changelog.d/1014.improvements | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1014.improvements diff --git a/changelog.d/1014.improvements b/changelog.d/1014.improvements new file mode 100644 index 0000000000..650c7fcb53 --- /dev/null +++ b/changelog.d/1014.improvements @@ -0,0 +1 @@ +Changer le message d'erreur en cas de message non déchiffré. \ No newline at end of file From 56d293e66fe1be3ed0ebdcb008b1e4111aa7bc74 Mon Sep 17 00:00:00 2001 From: yostyle Date: Tue, 5 Mar 2024 11:22:03 +0100 Subject: [PATCH 3/3] Update english version --- library/ui-strings/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/ui-strings/src/main/res/values/strings.xml b/library/ui-strings/src/main/res/values/strings.xml index e368b4c0fb..2ac51767d0 100644 --- a/library/ui-strings/src/main/res/values/strings.xml +++ b/library/ui-strings/src/main/res/values/strings.xml @@ -2811,7 +2811,7 @@ Set avatar You cannot access this message - Decryption in progress… + Decrypting… Due to end-to-end encryption, you might need to wait for someone\'s message to arrive because the encryption keys were not properly sent to you. You cannot access this message because you have been blocked by the sender You cannot access this message because your session is not trusted by the sender