toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Make Post time format respect user display setting (#977)

Browse source
This commit is contained in:
enahum 2017-10-02 12:39:02 -03:00 committed by Jarred Witt
parent 82b3dcc1f6
commit cc55b03e75
2 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/components/post_header/index.js
View file

@ -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,

14
app/components/post_header/post_header.js
View file

@ -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>
);
}