fix 12/24h in Reply/ReplyPreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
cb293a852d
commit
f1a3592eff
2 changed files with 10 additions and 2 deletions
|
@ -197,7 +197,10 @@ export default class Reply extends React.Component {
|
||||||
|
|
||||||
return <blockquote className="mx_Reply" key={ev.getId()}>
|
return <blockquote className="mx_Reply" key={ev.getId()}>
|
||||||
{ dateSep }
|
{ dateSep }
|
||||||
<EventTile mxEvent={ev} tileShape="reply" onWidgetLoad={this.props.onWidgetLoad} />
|
<EventTile mxEvent={ev}
|
||||||
|
tileShape="reply"
|
||||||
|
onWidgetLoad={this.props.onWidgetLoad}
|
||||||
|
isTwelveHour={SettingsStore.getValue("showTwelveHourTimestamps")} />
|
||||||
</blockquote>;
|
</blockquote>;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -19,6 +19,7 @@ import dis from '../../../dispatcher';
|
||||||
import sdk from '../../../index';
|
import sdk from '../../../index';
|
||||||
import { _t } from '../../../languageHandler';
|
import { _t } from '../../../languageHandler';
|
||||||
import RoomViewStore from '../../../stores/RoomViewStore';
|
import RoomViewStore from '../../../stores/RoomViewStore';
|
||||||
|
import SettingsStore from "../../../settings/SettingsStore";
|
||||||
|
|
||||||
function cancelQuoting() {
|
function cancelQuoting() {
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
|
@ -71,7 +72,11 @@ export default class ReplyPreview extends React.Component {
|
||||||
onClick={cancelQuoting} />
|
onClick={cancelQuoting} />
|
||||||
</div>
|
</div>
|
||||||
<div className="mx_ReplyPreview_clear" />
|
<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>
|
||||||
</div>;
|
</div>;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue