Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Collect decryption failure translations together (#12436)
Browse files Browse the repository at this point in the history
* Collect decryption failure translations together

They are not specific to threads.

* Revert changes to non-english languages
  • Loading branch information
richvdh authored Apr 18, 2024
1 parent 0e65a5a commit d402b52
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/components/views/messages/DecryptionFailureBody.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import { IBodyProps } from "./IBodyProps";

function getErrorMessage(mxEvent?: MatrixEvent): string {
return mxEvent?.isEncryptedDisabledForUnverifiedDevices
? _t("timeline|decryption_failure_blocked")
: _t("threads|unable_to_decrypt");
? _t("timeline|decryption_failure|blocked")
: _t("timeline|decryption_failure|unable_to_decrypt");
}

// A placeholder element for messages that could not be decrypted
Expand Down
6 changes: 4 additions & 2 deletions src/components/views/rooms/ThreadSummary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,11 @@ export const ThreadMessagePreview: React.FC<IPreviewProps> = ({ thread, showDisp
{lastReply.isDecryptionFailure() ? (
<div
className="mx_ThreadSummary_content mx_DecryptionFailureBody"
title={_t("threads|unable_to_decrypt")}
title={_t("timeline|decryption_failure|unable_to_decrypt")}
>
<span className="mx_ThreadSummary_message-preview">{_t("threads|unable_to_decrypt")}</span>
<span className="mx_ThreadSummary_message-preview">
{_t("timeline|decryption_failure|unable_to_decrypt")}
</span>
</div>
) : (
<div className="mx_ThreadSummary_content" title={preview}>
Expand Down
8 changes: 5 additions & 3 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -3162,8 +3162,7 @@
"my_threads_description": "Shows all threads you've participated in",
"open_thread": "Open thread",
"show_all_threads": "Show all threads",
"show_thread_filter": "Show:",
"unable_to_decrypt": "Unable to decrypt message"
"show_thread_filter": "Show:"
},
"threads_activity_centre": {
"header": "Threads activity",
Expand Down Expand Up @@ -3213,7 +3212,10 @@
},
"creation_summary_dm": "%(creator)s created this DM.",
"creation_summary_room": "%(creator)s created and configured the room.",
"decryption_failure_blocked": "The sender has blocked you from receiving this message",
"decryption_failure": {
"blocked": "The sender has blocked you from receiving this message",
"unable_to_decrypt": "Unable to decrypt message"
},
"disambiguated_profile": "%(displayName)s (%(matrixId)s)",
"download_action_decrypting": "Decrypting",
"download_action_downloading": "Downloading",
Expand Down

0 comments on commit d402b52

Please sign in to comment.