Merge branch 'i18n' into 'develop'

Minor strings improvements

See merge request soapbox-pub/soapbox!2542

app/soapbox/features/group/components/group-member-list-item.tsx

@@ -22,7 +22,7 @@ import type { Group, GroupMember } from 'soapbox/types/entities';
 
 const messages = defineMessages({
   adminLimitTitle: { id: 'group.member.admin.limit.title', defaultMessage: 'Admin limit reached' },
-  adminLimitSummary: { id: 'group.member.admin.limit.summary', defaultMessage: 'You can assign up to {count} admins for the group at this time.' },
+  adminLimitSummary: { id: 'group.member.admin.limit.summary', defaultMessage: 'You can assign up to {count, plural, one {admin} other {admins}} for the group at this time.' },
   blockConfirm: { id: 'confirmations.block_from_group.confirm', defaultMessage: 'Ban' },
   blockFromGroupHeading: { id: 'confirmations.block_from_group.heading', defaultMessage: 'Ban From Group' },
   blockFromGroupMessage: { id: 'confirmations.block_from_group.message', defaultMessage: 'Are you sure you want to ban @{name} from the group?' },
@@ -210,4 +210,4 @@ const GroupMemberListItem = (props: IGroupMemberListItem) => {
   );
 };
 
-export default GroupMemberListItem;
+export default GroupMemberListItem;

app/soapbox/locales/en.json

@@ -767,7 +767,7 @@
   "gdpr.message": "{siteTitle} uses session cookies, which are essential to the website's functioning.",
   "gdpr.title": "{siteTitle} uses cookies",
   "getting_started.open_source_notice": "{code_name} is open source software. You can contribute or report issues at {code_link} (v{code_version}).",
-  "group.banned.message": "You are banned from",
+  "group.banned.message": "You are banned from {group}",
   "group.cancel_request": "Cancel Request",
   "group.delete.success": "Group successfully deleted",
   "group.deleted.message": "This group has been deleted.",
@@ -791,7 +791,7 @@
   "group.leave.label": "Leave",
   "group.leave.success": "Left the group",
   "group.manage": "Manage Group",
-  "group.member.admin.limit.summary": "You can assign up to {count} admins for the group at this time.",
+  "group.member.admin.limit.summary": "You can assign up to {count, plural, one {admin} other {admins}} for the group at this time.",
   "group.member.admin.limit.title": "Admin limit reached",
   "group.popover.action": "View Group",
   "group.popover.summary": "You must be a member of the group in order to reply to this status.",

app/soapbox/pages/group-page.tsx

@@ -82,10 +82,11 @@ const BlockedBlankslate = ({ group }: { group: Group }) => (
     <Text theme='muted'>
       <FormattedMessage
         id='group.banned.message'
-        defaultMessage='You are banned from'
+        defaultMessage='You are banned from {group}'
+        values={{
+          group: <Text theme='inherit' tag='span' dangerouslySetInnerHTML={{ __html: group.display_name_html }} />,
+        }}
       />
-      {' '}
-      <Text theme='inherit' tag='span' dangerouslySetInnerHTML={{ __html: group.display_name_html }} />
     </Text>
   </Stack>
 );