diff options
| author | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-12 20:19:07 +0500 |
|---|---|---|
| committer | Asaad Mahmood <asaad@spinpunch.com> | 2016-02-12 20:19:07 +0500 |
| commit | 7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a (patch) | |
| tree | 069222c906cbf56feb003c806f60230cdbf81844 /web/react/utils/utils.jsx | |
| parent | 6bf1203581a295e82116c23bc4fe2d9d29362cf4 (diff) | |
| parent | 6cb4f82ee5a17cd1d32ae19c266b78c2cfd604e6 (diff) | |
| download | chat-7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a.tar.gz chat-7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a.tar.bz2 chat-7bea418a6575d8d02c1f3eb9f3dbb99fe4d90b0a.zip | |
Merge branch 'master' of https://github.com/mattermost/platform into ui-fixes
Diffstat (limited to 'web/react/utils/utils.jsx')
| -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); |