mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Make valid-i18n-keys rule strict and fix most exceptions

Browse source
This commit is contained in:
Jamie Kyle 2023-03-29 10:15:54 -07:00 • committed by GitHub
parent 18a6da310f
commit 11cfcb4e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 796 additions and 687 deletions
Download patch file Download diff file Expand all files Collapse all files

55
ts/components/conversation/GroupV1Migration.tsx
View file

@ -60,16 +60,8 @@ export function GroupV1Migration(props: PropsType): React.ReactElement {
i18n('GroupV1--Migration--invited--you')
) : (
<>
{renderUsers(
invitedMembers,
i18n,
'GroupV1--Migration--invited'
)}
{renderUsers(
droppedMembers,
i18n,
'GroupV1--Migration--removed'
)}
{renderUsers(invitedMembers, i18n, 'invited')}
{renderUsers(droppedMembers, i18n, 'removed')}
</>
)}
</p>
@ -106,31 +98,52 @@ export function GroupV1Migration(props: PropsType): React.ReactElement {
function renderUsers(
members: Array<ConversationType>,
i18n: LocalizerType,
keyPrefix: string
kind: 'invited' | 'removed'
): React.ReactElement | null {
if (!members || members.length === 0) {
return null;
}
if (members.length === 1) {
const contact = <ContactName title={members[0].title} />;
return (
<p>
<Intl
i18n={i18n}
id={`${keyPrefix}--one`}
components={{
contact: <ContactName title={members[0].title} />,
}}
/>
{kind === 'invited' && (
<Intl
i18n={i18n}
id="GroupV1--Migration--invited--one"
components={{ contact }}
/>
)}
{kind === 'removed' && (
<Intl
i18n={i18n}
id="GroupV1--Migration--removed--one"
components={{ contact }}
/>
)}
</p>
);
}
const count = members.length.toString();
return (
<p>
{i18n(`${keyPrefix}--many`, {
count: members.length.toString(),
})}
{kind === 'invited' && members.length > 1 && (
<Intl
i18n={i18n}
id="GroupV1--Migration--invited--many"
components={{ count }}
/>
)}
{kind === 'removed' && members.length > 1 && (
<Intl
i18n={i18n}
id="GroupV1--Migration--removed--many"
components={{ count }}
/>
)}
</p>
);
}