]> cat aescling's git repositories - mastodon.git/commitdiff
Fix #391 - relative timestamps now contain an exact datetime in title
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 4 Jan 2017 14:43:28 +0000 (15:43 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 4 Jan 2017 14:43:28 +0000 (15:43 +0100)
app/assets/javascripts/components/components/relative_timestamp.jsx

index 3a5b88523617cc066aaa5f2a2de71cf89fd1f690..3b012b184b4344ca67198d72005f5c35cfe873cb 100644 (file)
@@ -1,15 +1,18 @@
-import {
-  FormattedMessage,
-  FormattedDate,
-  FormattedRelative
-} from 'react-intl';
-
-const RelativeTimestamp = ({ timestamp }) => {
-  return <FormattedRelative value={new Date(timestamp)} />;
+import { injectIntl, FormattedRelative } from 'react-intl';
+
+const RelativeTimestamp = ({ intl, timestamp }) => {
+  const date = new Date(timestamp);
+
+  return (
+    <time dateTime={timestamp} title={intl.formatDate(date, { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' })}>
+      <FormattedRelative value={date} />
+    </time>
+  );
 };
 
 RelativeTimestamp.propTypes = {
+  intl: React.PropTypes.object.isRequired,
   timestamp: React.PropTypes.string.isRequired
 };
 
-export default RelativeTimestamp;
+export default injectIntl(RelativeTimestamp);