diff options
author | enahum <nahumhbl@gmail.com> | 2016-11-04 18:20:13 -0300 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-04 17:20:13 -0400 |
commit | 20254073cb9976e783875f997a291829e6a0d78d (patch) | |
tree | 02987516a3f41a0116761e6a889ad3951d57cb29 /webapp/components/rhs_root_post.jsx | |
parent | 7117fc05620eef128dc351e3637dc4f61d463ef9 (diff) | |
download | chat-20254073cb9976e783875f997a291829e6a0d78d.tar.gz chat-20254073cb9976e783875f997a291829e6a0d78d.tar.bz2 chat-20254073cb9976e783875f997a291829e6a0d78d.zip |
PLT-443 Fix timestamps UI in center channel and RHS (#4463)
Diffstat (limited to 'webapp/components/rhs_root_post.jsx')
-rw-r--r-- | webapp/components/rhs_root_post.jsx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx index a0edd716e..aa663bda7 100644 --- a/webapp/components/rhs_root_post.jsx +++ b/webapp/components/rhs_root_post.jsx @@ -20,7 +20,7 @@ import * as PostUtils from 'utils/post_utils.jsx'; import Constants from 'utils/constants.jsx'; import {Tooltip, OverlayTrigger} from 'react-bootstrap'; -import {FormattedMessage, FormattedDate} from 'react-intl'; +import {FormattedMessage} from 'react-intl'; import React from 'react'; @@ -357,6 +357,15 @@ export default class RhsRootPost extends React.Component { flagFunc = this.flagPost; } + const timeOptions = { + day: 'numeric', + month: 'short', + year: 'numeric', + hour: '2-digit', + minute: '2-digit', + hour12: !this.props.useMilitaryTime + }; + return ( <div className={'post post--root post--thread ' + userCss + ' ' + systemMessageClass + ' ' + compactClass}> <div className='post-right-channel__name'>{channelName}</div> @@ -368,15 +377,7 @@ export default class RhsRootPost extends React.Component { {botIndicator} <li className='col'> <time className='post__time'> - <FormattedDate - value={post.create_at} - day='numeric' - month='short' - year='numeric' - hour12={!this.props.useMilitaryTime} - hour='2-digit' - minute='2-digit' - /> + {Utils.getDateForUnixTicks(post.create_at).toLocaleString('en', timeOptions)} </time> <OverlayTrigger key={'rootpostflagtooltipkey' + flagVisible} |