summaryrefslogtreecommitdiffstats
path: root/webapp/components/post_view
diff options
context:
space:
mode:
authorenahum <nahumhbl@gmail.com>2016-11-04 18:20:13 -0300
committerHarrison Healey <harrisonmhealey@gmail.com>2016-11-04 17:20:13 -0400
commit20254073cb9976e783875f997a291829e6a0d78d (patch)
tree02987516a3f41a0116761e6a889ad3951d57cb29 /webapp/components/post_view
parent7117fc05620eef128dc351e3637dc4f61d463ef9 (diff)
downloadchat-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/post_view')
-rw-r--r--webapp/components/post_view/components/post_time.jsx9
1 files changed, 2 insertions, 7 deletions
diff --git a/webapp/components/post_view/components/post_time.jsx b/webapp/components/post_view/components/post_time.jsx
index 369a429a9..c8e57f6a9 100644
--- a/webapp/components/post_view/components/post_time.jsx
+++ b/webapp/components/post_view/components/post_time.jsx
@@ -6,7 +6,7 @@ import React from 'react';
import Constants from 'utils/constants.jsx';
import PureRenderMixin from 'react-addons-pure-render-mixin';
-import {FormattedTime} from 'react-intl';
+import {getDateForUnixTicks} from 'utils/utils.jsx';
export default class PostTime extends React.Component {
constructor(props) {
@@ -28,12 +28,7 @@ export default class PostTime extends React.Component {
render() {
return (
<time className='post__time'>
- <FormattedTime
- value={this.props.eventTime}
- hour='2-digit'
- minute='2-digit'
- hour12={!this.props.useMilitaryTime}
- />
+ {getDateForUnixTicks(this.props.eventTime).toLocaleString('en', {hour: '2-digit', minute: '2-digit', hour12: !this.props.useMilitaryTime})}
</time>
);
}