From b0252c9aa91ff9382600cd0cb66b69530f080941 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 11 Feb 2016 16:29:52 -0300 Subject: [PATCH 1/2] Fix duplicate am/pm on last password update --- .../components/user_settings/user_settings_security.jsx | 8 +++----- web/react/utils/utils.jsx | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index 5693047c27..166f5ec45a 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -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.useMilitaryTime(); 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() { diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index e2a5b96209..9880f252ba 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -260,6 +260,10 @@ export function displayTimeFormatted(ticks) { ); } +export function useMilitaryTime() { + return PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time'); +} + export function displayDateTime(ticks) { var seconds = Math.floor((Date.now() - ticks) / 1000); From ae8c67365de589238066237c667f5132ced13087 Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Thu, 11 Feb 2016 16:46:46 -0300 Subject: [PATCH 2/2] eslint no-shadow resolved --- web/react/components/user_settings/user_settings_security.jsx | 2 +- web/react/utils/utils.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index 166f5ec45a..53d79906fc 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -219,7 +219,7 @@ class SecurityTab extends React.Component { var d = new Date(this.props.user.last_password_update); const locale = global.window.mm_locale; - const hours12 = !Utils.useMilitaryTime(); + const hours12 = !Utils.isMilitaryTime(); describe = formatMessage(holders.lastUpdated, { date: d.toLocaleDateString(locale, {month: 'short', day: '2-digit', year: 'numeric'}), time: d.toLocaleTimeString(locale, {hour12: hours12, hour: '2-digit', minute: '2-digit'}) diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 9880f252ba..7f124149df 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -260,7 +260,7 @@ export function displayTimeFormatted(ticks) { ); } -export function useMilitaryTime() { +export function isMilitaryTime() { return PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time'); }