Skip to content

Commit d1d4bef

Browse files
authored
Merge pull request matrix-org#4622 from aaronraimist/redaction-timestamp
Show timestamp of redaction on hover
2 parents a36a03b + c2dd4a5 commit d1d4bef

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

src/components/views/messages/RedactedBody.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {MatrixClient} from "matrix-js-sdk/src/client";
1919
import {MatrixEvent} from "matrix-js-sdk/src/models/event";
2020
import { _t } from "../../../languageHandler";
2121
import MatrixClientContext from "../../../contexts/MatrixClientContext";
22+
import {formatFullDate} from "../../../DateUtils";
23+
import SettingsStore from "../../../settings/SettingsStore";
2224

2325
interface IProps {
2426
mxEvent: MatrixEvent;
@@ -36,8 +38,12 @@ const RedactedBody = React.forwardRef<any, IProps>(({mxEvent}, ref) => {
3638
text = _t("Message deleted by %(name)s", { name: sender ? sender.name : redactedBecauseUserId });
3739
}
3840

41+
const showTwelveHour = SettingsStore.getValue("showTwelveHourTimestamps");
42+
const fullDate = formatFullDate(new Date(unsigned.redacted_because.origin_server_ts), showTwelveHour);
43+
const titleText = _t("Message deleted on %(date)s", { date: fullDate });
44+
3945
return (
40-
<span className="mx_RedactedBody" ref={ref}>
46+
<span className="mx_RedactedBody" ref={ref} title={titleText}>
4147
{ text }
4248
</span>
4349
);

src/i18n/strings/en_EN.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,6 +1427,7 @@
14271427
"<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>": "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
14281428
"Message deleted": "Message deleted",
14291429
"Message deleted by %(name)s": "Message deleted by %(name)s",
1430+
"Message deleted on %(date)s": "Message deleted on %(date)s",
14301431
"%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
14311432
"%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
14321433
"%(senderDisplayName)s changed the room avatar to <img/>": "%(senderDisplayName)s changed the room avatar to <img/>",

0 commit comments

Comments
 (0)