Merge pull request #2074 from rgarmsen2295/plt-1882

PLT-1882 Fixed issue with on-hover timestamps

2 files changed, 17 insertions, 1 deletions

diff --git a/web/react/components/time_since.jsx b/web/react/components/time_since.jsx
index ba8dbffcc..1560d2469 100644
--- a/web/react/components/time_since.jsx
+++ b/web/react/components/time_since.jsx
@@ -2,6 +2,7 @@
 // See License.txt for license information.
 
 import Constants from '../utils/constants.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 import {FormattedRelative, FormattedDate} from 'mm-intl';
 
@@ -24,7 +25,7 @@ export default class TimeSince extends React.Component {
         if (this.props.sameUser) {
             return (
                 <time className='post__time'>
-                    <FormattedRelative value={this.props.eventTime} />
+                    {Utils.displayTimeFormatted(this.props.eventTime)}
                 </time>
             );
         }
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index 6bb7baa64..4beec8d64 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -14,6 +14,8 @@ import * as AsyncClient from './async_client.jsx';
 import * as client from './client.jsx';
 import Autolinker from 'autolinker';
 
+import {FormattedTime} from 'mm-intl';
+
 export function isEmail(email) {
     // writing a regex to match all valid email addresses is really, really hard (see http://stackoverflow.com/a/201378)
     // so we just do a simple check and rely on a verification email to tell if it's a real address
@@ -245,6 +247,19 @@ export function displayTime(ticks, utc) {
     return hours + ':' + minutes + ampm + timezone;
 }
 
+export function displayTimeFormatted(ticks) {
+    const useMilitaryTime = PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time');
+
+    return (
+        <FormattedTime
+            value={ticks}
+            hour='numeric'
+            minute='numeric'
+            hour12={!useMilitaryTime}
+        />
+    );
+}
+
 export function displayDateTime(ticks) {
     var seconds = Math.floor((Date.now() - ticks) / 1000);