diff --git a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js index a3b524db1..038a77c5a 100644 --- a/app/javascript/mastodon/features/follow_requests/components/account_authorize.js +++ b/app/javascript/mastodon/features/follow_requests/components/account_authorize.js @@ -5,44 +5,73 @@ import Permalink from '../../../components/permalink'; import Avatar from '../../../components/avatar'; import DisplayName from '../../../components/display_name'; import IconButton from '../../../components/icon_button'; -import { defineMessages, injectIntl } from 'react-intl'; +import { defineMessages, FormattedMessage, injectIntl } from 'react-intl'; +import { shortNumberFormat } from 'mastodon/utils/numbers'; import ImmutablePureComponent from 'react-immutable-pure-component'; const messages = defineMessages({ authorize: { id: 'follow_request.authorize', defaultMessage: 'Authorize' }, - reject: { id: 'follow_request.reject', defaultMessage: 'Reject' }, + reject : { id: 'follow_request.reject', defaultMessage: 'Reject' }, }); export default @injectIntl class AccountAuthorize extends ImmutablePureComponent { static propTypes = { - account: ImmutablePropTypes.map.isRequired, + account : ImmutablePropTypes.map.isRequired, onAuthorize: PropTypes.func.isRequired, - onReject: PropTypes.func.isRequired, - intl: PropTypes.object.isRequired, + onReject : PropTypes.func.isRequired, + intl : PropTypes.object.isRequired, }; - render () { + render() { const { intl, account, onAuthorize, onReject } = this.props; const content = { __html: account.get('note_emojified') }; return (
- -
+ +
-
+ {/*count posts*/} + {shortNumberFormat(account.get('statuses_count'))} + +
-
-
+
+
-
-
-
-
+
+ {intl.formatMessage(messages.authorize)} +
+
+ {intl.formatMessage(messages.reject)} +
+
+ ); } diff --git a/app/views/relationships/show.html.haml b/app/views/relationships/show.html.haml index 099bb3202..957adb74a 100644 --- a/app/views/relationships/show.html.haml +++ b/app/views/relationships/show.html.haml @@ -3,7 +3,8 @@ - content_for :header_tags do = javascript_pack_tag 'admin', integrity: true, async: true, crossorigin: 'anonymous' - +.well + %strong= @accounts.length .filters .filter-subset %strong= t 'relationships.relationship'