OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Use showTwelveHourTimestamps 

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
pull/21833/head
Šimon Brandner 2021-02-24 20:07:41 +01:00
parent 983895289c
commit 6008a6f9fa
No known key found for this signature in database
GPG Key ID: 9760693FDD98A790
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/components/views/elements/ImageView.js
View File

@ -29,7 +29,7 @@ import {ContextMenuTooltipButton} from "../../../accessibility/context_menu/Cont
import MessageContextMenu from "../context_menus/MessageContextMenu";
import {aboveLeftOf, ContextMenu} from '../../structures/ContextMenu';
import MessageTimestamp from "../messages/MessageTimestamp";
import SenderProfile from '../messages/SenderProfile';
import SettingsStore from "../../../settings/SettingsStore";
export default class ImageView extends React.Component {
static propTypes = {
@ -259,10 +259,11 @@ export default class ImageView extends React.Component {
let info;
if (showEventMeta) {
const mxEvent = this.props.mxEvent;
const showTwelveHour = SettingsStore.getValue("showTwelveHourTimestamps");
const senderName = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
const messageTimestamp = (
<MessageTimestamp showTwelveHour={false} ts={mxEvent.getTs()} />
<MessageTimestamp showTwelveHour={showTwelveHour} ts={mxEvent.getTs()} />
);
const avatar = (
<MemberAvatar