IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Separated displayTime functions for component/string form

Browse Source
This commit is contained in:
Reed Garmsen
2016-02-05 09:23:40 -08:00
parent 1778eb8115
commit d416a04e52
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/react/components/time_since.jsx
View File

@@ -25,7 +25,7 @@ export default class TimeSince extends React.Component {
if (this.props.sameUser) {
return (
<time className='post__time'>
{Utils.displayTime(this.props.eventTime)}
{Utils.displayTimeFormatted(this.props.eventTime)}
</time>
);
}

38
web/react/utils/utils.jsx
View File

@@ -211,7 +211,43 @@ export function displayDate(ticks) {
return monthNames[d.getMonth()] + ' ' + d.getDate() + ', ' + d.getFullYear();
}
export function displayTime(ticks) {
export function displayTime(ticks, utc) {
const d = new Date(ticks);
let hours;
let minutes;
let ampm = '';
let timezone = '';
if (utc) {
hours = d.getUTCHours();
minutes = d.getUTCMinutes();
timezone = ' UTC';
} else {
hours = d.getHours();
minutes = d.getMinutes();
}
if (minutes <= 9) {
minutes = '0' + minutes;
}
const useMilitaryTime = PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time');
if (!useMilitaryTime) {
ampm = ' AM';
if (hours >= 12) {
ampm = ' PM';
}
hours = hours % 12;
if (!hours) {
hours = '12';
}
}
return hours + ':' + minutes + ampm + timezone;
}
export function displayTimeFormatted(ticks) {
const useMilitaryTime = PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time');
return (