Merge pull request #4092 from turt2live/travis/12hrtime-hotfix

Show 12hr time on hover too
element-hq · May 30, 2017 · 4493994 · 4493994
2 parents e79df6a + 676bd61
commit 4493994
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/components/views/messages/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
@@ -16,7 +16,6 @@ limitations under the License.
 
 'use strict';
 
-import * as UserSettingsStore from 'matrix-react-sdk/lib/UserSettingsStore';
 const React = require('react');
 const DateUtils = require('matrix-react-sdk/lib/DateUtils');
 
@@ -30,7 +29,7 @@ module.exports = React.createClass({
     render: function() {
         const date = new Date(this.props.ts);
         return (
-            <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date) }>
+            <span className="mx_MessageTimestamp" title={ DateUtils.formatFullDate(date, this.props.showTwelveHour) }>
                 { DateUtils.formatTime(date, this.props.showTwelveHour) }
             </span>
         );