summaryrefslogtreecommitdiffstats
path: root/webapp/components/time_since.jsx
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-05-02 18:15:08 -0300
committerCorey Hulen <corey@hulen.com>2016-05-02 14:15:08 -0700
commita169a8e882fc89154a3b1496a3f033bffaf62665 (patch)
tree35ab662eeae31392853c5208ebaa7da57927c359 /webapp/components/time_since.jsx
parenta92e1f79b6be8bcf7fcfa2a55d1a0587aa44946f (diff)
downloadchat-a169a8e882fc89154a3b1496a3f033bffaf62665.tar.gz
chat-a169a8e882fc89154a3b1496a3f033bffaf62665.tar.bz2
chat-a169a8e882fc89154a3b1496a3f033bffaf62665.zip
PLT-1915: Fix Timestamps are displayed as 12 hour even when set to 24 hour mode (#2852)
Diffstat (limited to 'webapp/components/time_since.jsx')
-rw-r--r--webapp/components/time_since.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/components/time_since.jsx b/webapp/components/time_since.jsx
index 9f7a93ceb..f715193e2 100644
--- a/webapp/components/time_since.jsx
+++ b/webapp/components/time_since.jsx
@@ -41,7 +41,7 @@ export default class TimeSince extends React.Component {
month='long'
day='numeric'
year='numeric'
- hour12={true}
+ hour12={!Utils.isMilitaryTime()}
hour='numeric'
minute='2-digit'
/>