diff --git a/README.md b/README.md index 8591fcc84..75e834237 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - +!-- IMPORTANT: remember to remove this flag immediately on july 1st --> # pl-fe 🏳️‍🌈 [![GitHub Repo stars](https://img.shields.io/github/stars/mkljczk/pl-fe)](https://github.com/mkljczk/pl-fe) diff --git a/packages/pl-fe/src/features/ui/components/action-button.tsx b/packages/pl-fe/src/features/ui/components/action-button.tsx index 6b65777ed..d6c7c488b 100644 --- a/packages/pl-fe/src/features/ui/components/action-button.tsx +++ b/packages/pl-fe/src/features/ui/components/action-button.tsx @@ -29,8 +29,8 @@ const messages = defineMessages({ follow: { id: 'account.follow', defaultMessage: 'Follow' }, mute: { id: 'account.mute', defaultMessage: 'Mute @{name}' }, remote_follow: { id: 'account.remote_follow', defaultMessage: 'Remote follow' }, - requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' }, - requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' }, + requested: { id: 'account.requested', defaultMessage: 'Follow requested. Click to cancel' }, + requested_small: { id: 'account.requested_small', defaultMessage: 'Follow requested' }, unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' }, @@ -55,7 +55,7 @@ interface IActionButton { * May say "Unblock" or something else, depending on the relationship and * `actionType` prop. */ -const ActionButton: React.FC = ({ account, actionType, small }) => { +const ActionButton: React.FC = ({ account, actionType, small = true }) => { const dispatch = useAppDispatch(); const features = useFeatures(); const intl = useIntl(); diff --git a/packages/pl-fe/src/locales/en.json b/packages/pl-fe/src/locales/en.json index b9c0a6efb..88d99eb0b 100644 --- a/packages/pl-fe/src/locales/en.json +++ b/packages/pl-fe/src/locales/en.json @@ -55,8 +55,8 @@ "account.remote_follow": "Remote follow", "account.remove_from_followers": "Remove this follower", "account.report": "Report @{name}", - "account.requested": "Awaiting approval. Click to cancel follow request", - "account.requested_small": "Awaiting approval", + "account.requested": "Follow requested. Click to cancel", + "account.requested_small": "Follow requested", "account.rss_feed": "Subscribe to RSS feed", "account.scrobbling": "Playing {song}", "account.scrobbling.title": "{title} by {artist}",