From b0252c9aa91ff9382600cd0cb66b69530f080941 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 11 Feb 2016 16:29:52 -0300
Subject: Fix duplicate am/pm on last password update

---
 web/react/utils/utils.jsx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'web/react/utils/utils.jsx')

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index e2a5b9620..9880f252b 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);
 
-- 
cgit v1.2.3-1-g7c22


From ae8c67365de589238066237c667f5132ced13087 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Thu, 11 Feb 2016 16:46:46 -0300
Subject: eslint no-shadow resolved

---
 web/react/utils/utils.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/utils/utils.jsx')

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');
 }
 
-- 
cgit v1.2.3-1-g7c22

