diff options
author | Elias Nahum <nahumhbl@gmail.com> | 2016-02-11 16:46:46 -0300 |
---|---|---|
committer | Elias Nahum <nahumhbl@gmail.com> | 2016-02-11 16:46:46 -0300 |
commit | ae8c67365de589238066237c667f5132ced13087 (patch) | |
tree | 0b58d89dc9efab1aa8ac96989fed0fc1f47e2dc9 /web | |
parent | b0252c9aa91ff9382600cd0cb66b69530f080941 (diff) | |
download | chat-ae8c67365de589238066237c667f5132ced13087.tar.gz chat-ae8c67365de589238066237c667f5132ced13087.tar.bz2 chat-ae8c67365de589238066237c667f5132ced13087.zip |
eslint no-shadow resolved
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/user_settings/user_settings_security.jsx | 2 | ||||
-rw-r--r-- | 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 166f5ec45..53d79906f 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 9880f252b..7f124149d 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'); } |