From 20254073cb9976e783875f997a291829e6a0d78d Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 4 Nov 2016 18:20:13 -0300 Subject: PLT-443 Fix timestamps UI in center channel and RHS (#4463) --- webapp/components/rhs_comment.jsx | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'webapp/components/rhs_comment.jsx') diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 85fe8abdf..c7b005845 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -19,7 +19,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 loadingGif from 'images/load.gif'; @@ -386,6 +386,15 @@ export default class RhsComment extends React.Component { ); } + const timeOptions = { + day: 'numeric', + month: 'short', + year: 'numeric', + hour: '2-digit', + minute: '2-digit', + hour12: !this.props.useMilitaryTime + }; + return (
@@ -398,15 +407,7 @@ export default class RhsComment extends React.Component { {botIndicator}
  • {flagTrigger}
  • -- cgit v1.2.3-1-g7c22