mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Add 12 hour support

Browse source
This commit is contained in:
Maxwell Kepler 2017-05-18 22:01:00 +01:00 • committed by Kieran Gould
parent dc990f47be
commit 9e37fa46b1
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/components/views/messages/MessageTimestamp.js
View file

@ -16,19 +16,28 @@ limitations under the License.
'use strict';
var React = require('react');
var DateUtils = require('matrix-react-sdk/lib/DateUtils');
import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
const React = require('react');
const DateUtils = require('matrix-react-sdk/lib/DateUtils');
module.exports = React.createClass({
displayName: 'MessageTimestamp',
render: function() {
var date = new Date(this.props.ts);
return (
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
{ DateUtils.formatTime(date) }
</span>
);
if (UserSettingsStore.getSyncedSetting('showTwelveHourTimestamps')) {
return (
<span style={{ textAlign: 'center' }} className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
{ DateUtils.formatTime(date) }
</span>
);
}
else {
return (
<span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
{ DateUtils.formatTime(date) }
</span>
);
}
},
});