From f1a3592efff389a90ac91097b829209c4f911556 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 16 Feb 2018 21:14:03 +0000
Subject: [PATCH] fix 12/24h in Reply/ReplyPreview

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/Reply.js     | 5 ++++-
 src/components/views/rooms/ReplyPreview.js | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/views/elements/Reply.js b/src/components/views/elements/Reply.js
index 944d90cdbd..f9161c7ada 100644
--- a/src/components/views/elements/Reply.js
+++ b/src/components/views/elements/Reply.js
@@ -197,7 +197,10 @@ export default class Reply extends React.Component {
 
             return <blockquote className="mx_Reply" key={ev.getId()}>
                 { dateSep }
-                <EventTile mxEvent={ev} tileShape="reply" onWidgetLoad={this.props.onWidgetLoad} />
+                <EventTile mxEvent={ev}
+                           tileShape="reply"
+                           onWidgetLoad={this.props.onWidgetLoad}
+                           isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
             </blockquote>;
         });
 
diff --git a/src/components/views/rooms/ReplyPreview.js b/src/components/views/rooms/ReplyPreview.js
index 0404511c9f..18e21c5ebc 100644
--- a/src/components/views/rooms/ReplyPreview.js
+++ b/src/components/views/rooms/ReplyPreview.js
@@ -19,6 +19,7 @@ import dis from '../../../dispatcher';
 import sdk from '../../../index';
 import { _t } from '../../../languageHandler';
 import RoomViewStore from '../../../stores/RoomViewStore';
+import SettingsStore from "../../../settings/SettingsStore";
 
 function cancelQuoting() {
     dis.dispatch({
@@ -71,7 +72,11 @@ export default class ReplyPreview extends React.Component {
                          onClick={cancelQuoting} />
                 </div>
                 <div className="mx_ReplyPreview_clear" />
-                <EventTile mxEvent={this.state.event} last={true} tileShape="reply_preview" onWidgetLoad={dummyOnWidgetLoad} />
+                <EventTile last={true}
+                           tileShape="reply_preview"
+                           mxEvent={this.state.event}
+                           onWidgetLoad={dummyOnWidgetLoad}
+                           isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
             </div>
         </div>;
     }