zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 10 Releases Wiki Activity

Fix #391 - relative timestamps now contain an exact datetime in title

This commit is contained in:
Eugen Rochko 2017-01-04 15:43:28 +01:00
parent 2b0b7ff1b8
commit 98b83aca37
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/components/components/relative_timestamp.jsx
View File

@ -1,15 +1,18 @@
import { import { injectIntl, FormattedRelative } from 'react-intl';
FormattedMessage,
FormattedDate,
FormattedRelative
} from 'react-intl';
const RelativeTimestamp = ({ timestamp }) => { const RelativeTimestamp = ({ intl, timestamp }) => {
return <FormattedRelative value={new Date(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 = { RelativeTimestamp.propTypes = {
intl: React.PropTypes.object.isRequired,
timestamp: React.PropTypes.string.isRequired timestamp: React.PropTypes.string.isRequired
}; };
export default RelativeTimestamp; export default injectIntl(RelativeTimestamp);