matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into group-modal

Browse Source
This commit is contained in:
Alex Gleason
2023-04-03 15:23:31 -05:00
parent a4992eec4d 316a224c08
commit 9aac68fee8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/soapbox/features/group/components/group-action-button.tsx
View File

@ -20,7 +20,7 @@ const messages = defineMessages({
confirmationConfirm: { id: 'confirmations.leave_group.confirm', defaultMessage: 'Leave' },
confirmationHeading: { id: 'confirmations.leave_group.heading', defaultMessage: 'Leave group' },
confirmationMessage: { id: 'confirmations.leave_group.message', defaultMessage: 'You are about to leave the group. Do you want to continue?' },
joinRequestSuccess: { id: 'group.join.request_success', defaultMessage: 'Requested to join the group' },
joinRequestSuccess: { id: 'group.join.request_success', defaultMessage: 'Request sent to group owner' },
joinSuccess: { id: 'group.join.success', defaultMessage: 'Group joined successfully!' },
leaveSuccess: { id: 'group.leave.success', defaultMessage: 'Left the group' },
});

2
app/soapbox/features/groups/components/discover/search/recent-searches.tsx
View File

@ -62,7 +62,7 @@ export default (props: Props) => {
<HStack alignItems='center' space={2}>
<div className='flex h-10 w-10 items-center justify-center rounded-full bg-gray-200 p-2 dark:bg-gray-800 dark:group-hover:bg-gray-700/20'>
<Icon
src={require('@tabler/icons/hash.svg')}
src={require('@tabler/icons/search.svg')}
className='h-5 w-5 text-gray-600'
/>
</div>

2
app/soapbox/locales/en.json
View File

@ -783,7 +783,7 @@
"group.header.alt": "Group header",
"group.join.private": "Request Access",
"group.join.public": "Join Group",
"group.join.request_success": "Requested to join the group",
"group.join.request_success": "Request sent to group owner",
"group.join.success": "Group joined successfully!",
"group.leave": "Leave Group",
"group.leave.success": "Left the group",