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

Merge pull request #2155 from ZBoxApp/PLT-1948

Browse Source 
PLT-1948: Fix duplicate am/pm on last password update
This commit is contained in:
Christopher Speller
2016-02-11 18:51:20 -05:00
parent ab1f5acf4d ae8c67365d
commit d538aa4a5f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/react/components/user_settings/user_settings_security.jsx
View File

@@ -11,6 +11,7 @@ import TeamStore from '../../stores/team_store.jsx';
import * as Client from '../../utils/client.jsx';
import * as AsyncClient from '../../utils/async_client.jsx';
import * as Utils from '../../utils/utils.jsx';
import Constants from '../../utils/constants.jsx';
import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'mm-intl';
@@ -216,15 +217,12 @@ class SecurityTab extends React.Component {
var describe;
var d = new Date(this.props.user.last_password_update);
var timeOfDay = ' am';
if (d.getHours() >= 12) {
timeOfDay = ' pm';
}
const locale = global.window.mm_locale;
const hours12 = !Utils.isMilitaryTime();
describe = formatMessage(holders.lastUpdated, {
date: d.toLocaleDateString(locale, {month: 'short', day: '2-digit', year: 'numeric'}),
time: d.toLocaleTimeString(locale, {hours12: true, hour: '2-digit', minute: '2-digit'}) + timeOfDay
time: d.toLocaleTimeString(locale, {hour12: hours12, hour: '2-digit', minute: '2-digit'})
});
updateSectionStatus = function updateSection() {

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

@@ -260,6 +260,10 @@ export function displayTimeFormatted(ticks) {
);
}
export function isMilitaryTime() {
return PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time');
}
export function displayDateTime(ticks) {
var seconds = Math.floor((Date.now() - ticks) / 1000);