Merge beta into release #21

Merged
didirus merged 276 commits from beta into release 2025-11-01 13:04:25 +00:00
2 changed files with 3 additions and 3 deletions
Showing only changes of commit 63d8f70e20 - Show all commits

View File

@@ -169,7 +169,7 @@ const messages = defineMessages({
},
viewFriendRequests: {
id: 'friends.action.view-friend-requests',
defaultMessage: '{count} friend requests',
defaultMessage: '{count} friend {count, plural, one {request} other {requests}}',
},
searchFriends: {
id: 'friends.search-friends-placeholder',
@@ -353,7 +353,7 @@ const messages = defineMessages({
:is-searching="!!search"
open-by-default
:friends="activeFriends"
:heading="formatMessage(messages.pending)"
:heading="formatMessage(messages.active)"
:remove-friend="removeFriend"
/>
<FriendsSection

View File

@@ -69,7 +69,7 @@
"message": "Add a friend"
},
"friends.action.view-friend-requests": {
"message": "{count} friend requests"
"message": "{count} friend {count, plural, one {request} other {requests}}"
},
"friends.add-friend.submit": {
"message": "Send friend request"