gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-11-27 18:10:58 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

Change unfollow button to distinguish pending follow requests

Browse Source
This commit is contained in:
Claire 2025-06-27 16:00:11 +02:00
parent 0d650780e2
commit 968246e3a0
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/account/index.tsx
View File

@ -39,7 +39,7 @@ const messages = defineMessages({
unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
cancel_follow_request: { cancel_follow_request: {
id: 'account.cancel_follow_request', id: 'account.cancel_follow_request',
defaultMessage: 'Withdraw follow request', defaultMessage: 'Cancel request',
}, },
unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' }, unblock: { id: 'account.unblock_short', defaultMessage: 'Unblock' },
unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' }, unmute: { id: 'account.unmute_short', defaultMessage: 'Unmute' },

8
app/javascript/mastodon/components/follow_button.tsx
View File

@ -13,6 +13,10 @@ import { me } from 'mastodon/initial_state';
import { useAppDispatch, useAppSelector } from 'mastodon/store'; import { useAppDispatch, useAppSelector } from 'mastodon/store';
const messages = defineMessages({ const messages = defineMessages({
cancel_follow_request: {
id: 'account.cancel_follow_request',
defaultMessage: 'Cancel request',
},
unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
follow: { id: 'account.follow', defaultMessage: 'Follow' }, follow: { id: 'account.follow', defaultMessage: 'Follow' },
followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' }, followBack: { id: 'account.follow_back', defaultMessage: 'Follow back' },
@ -75,7 +79,9 @@ export const FollowButton: React.FC<{
label = intl.formatMessage(messages.editProfile); label = intl.formatMessage(messages.editProfile);
} else if (!relationship) { } else if (!relationship) {
label = <LoadingIndicator />; label = <LoadingIndicator />;
} else if (relationship.following || relationship.requested) { } else if (relationship.requested) {
label = intl.formatMessage(messages.cancel_follow_request);
} else if (relationship.following) {
label = intl.formatMessage(messages.unfollow); label = intl.formatMessage(messages.unfollow);
} else if (relationship.followed_by) { } else if (relationship.followed_by) {
label = intl.formatMessage(messages.followBack); label = intl.formatMessage(messages.followBack);

2
app/javascript/mastodon/features/directory/components/account_card.tsx
View File

@ -26,7 +26,7 @@ const messages = defineMessages({
follow: { id: 'account.follow', defaultMessage: 'Follow' }, follow: { id: 'account.follow', defaultMessage: 'Follow' },
cancel_follow_request: { cancel_follow_request: {
id: 'account.cancel_follow_request', id: 'account.cancel_follow_request',
defaultMessage: 'Withdraw follow request', defaultMessage: 'Cancel request',
}, },
requested: { requested: {
id: 'account.requested', id: 'account.requested',

2
app/javascript/mastodon/locales/en.json
View File

@ -22,7 +22,7 @@
"account.block_short": "Block", "account.block_short": "Block",
"account.blocked": "Blocked", "account.blocked": "Blocked",
"account.blocking": "Blocking", "account.blocking": "Blocking",
"account.cancel_follow_request": "Cancel follow", "account.cancel_follow_request": "Cancel request",
"account.copy": "Copy link to profile", "account.copy": "Copy link to profile",
"account.direct": "Privately mention @{name}", "account.direct": "Privately mention @{name}",
"account.disable_notifications": "Stop notifying me when @{name} posts", "account.disable_notifications": "Stop notifying me when @{name} posts",