|
|
|
@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; |
|
|
|
|
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|
|
|
|
import StatusContainer from '../../../containers/status_container'; |
|
|
|
|
import AccountContainer from '../../../containers/account_container'; |
|
|
|
|
import RelativeTimestamp from '../../../components/relative_timestamp'; |
|
|
|
|
import { injectIntl, FormattedMessage } from 'react-intl'; |
|
|
|
|
import Permalink from '../../../components/permalink'; |
|
|
|
|
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|
|
|
@ -86,13 +85,12 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
<div className='notification__favourite-icon-wrapper'> |
|
|
|
|
<i className='fa fa-fw fa-user-plus' /> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<span title={notification.get('created_at')}> |
|
|
|
|
<FormattedMessage id='notification.follow' defaultMessage='{name} followed you' values={{ name: link }} /> |
|
|
|
|
<span className='notification__relative_time'> |
|
|
|
|
<RelativeTimestamp timestamp={notification.get('created_at')} /> |
|
|
|
|
</span> |
|
|
|
|
</span> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<AccountContainer id={account.get('id')} withNote={false} hidden={this.props.hidden} /> |
|
|
|
|
</div> |
|
|
|
|
</HotKeys> |
|
|
|
@ -122,9 +120,9 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
<div className='notification__favourite-icon-wrapper'> |
|
|
|
|
<i className='fa fa-fw fa-star star-icon' /> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<span title={notification.get('created_at')}> |
|
|
|
|
<FormattedMessage id='notification.favourite' defaultMessage='{name} favourited your status' values={{ name: link }} /> |
|
|
|
|
<span className='notification__relative_time'> |
|
|
|
|
<RelativeTimestamp className='notification__relative_time' timestamp={notification.get('created_at')} /> |
|
|
|
|
</span> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
@ -144,9 +142,9 @@ class Notification extends ImmutablePureComponent { |
|
|
|
|
<div className='notification__favourite-icon-wrapper'> |
|
|
|
|
<i className='fa fa-fw fa-retweet' /> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<span title={notification.get('created_at')}> |
|
|
|
|
<FormattedMessage id='notification.reblog' defaultMessage='{name} boosted your status' values={{ name: link }} /> |
|
|
|
|
<span className='notification__relative_time'> |
|
|
|
|
<RelativeTimestamp className='notification__relative_time' timestamp={notification.get('created_at')} /> |
|
|
|
|
</span> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|