From a169a8e882fc89154a3b1496a3f033bffaf62665 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Mon, 2 May 2016 18:15:08 -0300
Subject: PLT-1915: Fix Timestamps are displayed as 12 hour even when set to 24
 hour mode (#2852)

---
 webapp/components/rhs_comment.jsx         | 2 +-
 webapp/components/rhs_root_post.jsx       | 2 +-
 webapp/components/search_results_item.jsx | 2 +-
 webapp/components/time_since.jsx          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'webapp/components')

diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx
index 290eb64c6..452174045 100644
--- a/webapp/components/rhs_comment.jsx
+++ b/webapp/components/rhs_comment.jsx
@@ -275,7 +275,7 @@ export default class RhsComment extends React.Component {
                                         day='numeric'
                                         month='long'
                                         year='numeric'
-                                        hour12={true}
+                                        hour12={!Utils.isMilitaryTime()}
                                         hour='2-digit'
                                         minute='2-digit'
                                     />
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 9a207e429..d56306d28 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -240,7 +240,7 @@ export default class RhsRootPost extends React.Component {
                                         day='numeric'
                                         month='long'
                                         year='numeric'
-                                        hour12={true}
+                                        hour12={!Utils.isMilitaryTime()}
                                         hour='2-digit'
                                         minute='2-digit'
                                     />
diff --git a/webapp/components/search_results_item.jsx b/webapp/components/search_results_item.jsx
index 85d069dbc..7804cab7b 100644
--- a/webapp/components/search_results_item.jsx
+++ b/webapp/components/search_results_item.jsx
@@ -100,7 +100,7 @@ export default class SearchResultsItem extends React.Component {
                                     <time className='search-item-time'>
                                         <FormattedDate
                                             value={post.create_at}
-                                            hour12={true}
+                                            hour12={!Utils.isMilitaryTime()}
                                             hour='2-digit'
                                             minute='2-digit'
                                         />
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'
                 />
-- 
cgit v1.2.3-1-g7c22