imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into florianduros/tooltip-update

Browse source
This commit is contained in:
Florian Duros 2024-04-18 15:41:16 +02:00 • committed by GitHub
commit c97a3740ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/views/messages/DecryptionFailureBody.tsx
View file

@ -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

6
src/components/views/rooms/ThreadSummary.tsx
View file

@ -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}>