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

57
ts/components/conversation/MessageRequestActions.tsx
View file

@ -35,6 +35,15 @@ export function MessageRequestActions({
}: Props): JSX.Element {
const [mrState, setMrState] = React.useState(MessageRequestState.default);
const name = (
<strong
key="name"
className="module-message-request-actions__message__name"
>
<ContactName firstName={firstName} title={title} preferFirstName />
</strong>
);
return (
<>
{mrState !== MessageRequestState.default ? (
@ -53,26 +62,34 @@ export function MessageRequestActions({
) : null}
<div className="module-message-request-actions">
<p className="module-message-request-actions__message">
<Intl
i18n={i18n}
id={`MessageRequests--message-${conversationType}${
isBlocked ? '-blocked' : ''
}`}
components={{
name: (
<strong
key="name"
className="module-message-request-actions__message__name"
>
<ContactName
firstName={firstName}
title={title}
preferFirstName
/>
</strong>
),
}}
/>
{conversationType === 'direct' && isBlocked && (
<Intl
i18n={i18n}
id="MessageRequests--message-direct-blocked"
components={{ name }}
/>
)}
{conversationType === 'direct' && !isBlocked && (
<Intl
i18n={i18n}
id="MessageRequests--message-direct"
components={{ name }}
/>
)}
{conversationType === 'group' && isBlocked && (
<Intl
i18n={i18n}
id="MessageRequests--message-group-blocked"
components={{ name }}
/>
)}
{conversationType === 'group' && !isBlocked && (
<Intl
i18n={i18n}
id="MessageRequests--message-group"
components={{ name }}
/>
)}
</p>
<div className="module-message-request-actions__buttons">
<Button