diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-02-11 18:51:20 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-02-11 18:51:20 -0500 |
| commit | d538aa4a5fd603ff668c87f67035e26449129754 (patch) | |
| tree | 1b594dd4847545facc20c295e90aede0a1cace8b /web/react/utils | |
| parent | ab1f5acf4d573cc1fae4936650d7e2eb07afdb2e (diff) | |
| parent | ae8c67365de589238066237c667f5132ced13087 (diff) | |
| download | chat-d538aa4a5fd603ff668c87f67035e26449129754.tar.gz chat-d538aa4a5fd603ff668c87f67035e26449129754.tar.bz2 chat-d538aa4a5fd603ff668c87f67035e26449129754.zip | |
Merge pull request #2155 from ZBoxApp/PLT-1948
PLT-1948: Fix duplicate am/pm on last password update
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/utils.jsx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index e2a5b9620..7f124149d 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -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); |