From cc55b03e7567f578cead02f5239d2fd4abc5ae65 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Mon, 2 Oct 2017 12:39:02 -0300
Subject: [PATCH] Make Post time format respect user display setting (#977)

---
 app/components/post_header/index.js       |  5 ++++-
 app/components/post_header/post_header.js | 14 +++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/components/post_header/index.js b/app/components/post_header/index.js
index 4efa2e94a..e0083514c 100644
--- a/app/components/post_header/index.js
+++ b/app/components/post_header/index.js
@@ -3,8 +3,9 @@
 
 import {connect} from 'react-redux';
 
+import {Preferences} from 'mattermost-redux/constants';
 import {getPost, makeGetCommentCountForPost} from 'mattermost-redux/selectors/entities/posts';
-import {getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
+import {getBool, getTeammateNameDisplaySetting} from 'mattermost-redux/selectors/entities/preferences';
 import {getUser} from 'mattermost-redux/selectors/entities/users';
 import {isPostPendingOrFailed, isSystemMessage} from 'mattermost-redux/utils/post_utils';
 import {displayUsername} from 'mattermost-redux/utils/user_utils';
@@ -21,6 +22,7 @@ function makeMapStateToProps() {
         const commentedOnUser = getUser(state, ownProps.commentedOnUserId);
         const user = getUser(state, post.user_id);
         const teammateNameDisplay = getTeammateNameDisplaySetting(state);
+        const militaryTime = getBool(state, Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time');
 
         return {
             ...ownProps,
@@ -30,6 +32,7 @@ function makeMapStateToProps() {
             displayName: displayUsername(user, teammateNameDisplay),
             enablePostUsernameOverride: config.EnablePostUsernameOverride === 'true',
             fromWebHook: post.props && post.props.from_webhook === 'true',
+            militaryTime,
             isPendingOrFailedPost: isPostPendingOrFailed(post),
             isSystemMessage: isSystemMessage(post),
             overrideUsername: post.props && post.props.override_username,
diff --git a/app/components/post_header/post_header.js b/app/components/post_header/post_header.js
index bdd3738f9..fa0d089d8 100644
--- a/app/components/post_header/post_header.js
+++ b/app/components/post_header/post_header.js
@@ -28,12 +28,13 @@ export default class PostHeader extends PureComponent {
         fromWebHook: PropTypes.bool,
         isPendingOrFailedPost: PropTypes.bool,
         isSearchResult: PropTypes.bool,
-        shouldRenderReplyButton: PropTypes.bool,
         isSystemMessage: PropTypes.bool,
+        militaryTime: PropTypes.bool,
         onPress: PropTypes.func,
         onViewUserProfile: PropTypes.func,
         overrideUsername: PropTypes.string,
         renderReplies: PropTypes.bool,
+        shouldRenderReplyButton: PropTypes.bool,
         showFullDate: PropTypes.bool,
         theme: PropTypes.object.isRequired
     };
@@ -142,6 +143,7 @@ export default class PostHeader extends PureComponent {
             createAt,
             isPendingOrFailedPost,
             isSearchResult,
+            militaryTime,
             onPress,
             renderReplies,
             shouldRenderReplyButton,
@@ -159,14 +161,20 @@ export default class PostHeader extends PureComponent {
                         <FormattedDate value={createAt}/>
                     </Text>
                     <Text style={style.time}>
-                        <FormattedTime value={createAt}/>
+                        <FormattedTime
+                            hour12={!militaryTime}
+                            value={createAt}
+                        />
                     </Text>
                 </View>
             );
         } else {
             dateComponent = (
                 <Text style={style.time}>
-                    <FormattedTime value={createAt}/>
+                    <FormattedTime
+                        hour12={!militaryTime}
+                        value={createAt}
+                    />
                 </Text>
             );
         }