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

Prepare for ICU migration

Browse source
This commit is contained in:
Jamie Kyle 2023-03-27 16:37:39 -07:00 committed by GitHub
parent d0f17a1398
commit 2781e621ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 550 additions and 414 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
_locales/en/messages.json
View file

@ -3093,7 +3093,7 @@
},
"Reactions--remove": {
"message": "Remove reaction",
"describe": "Shown when you want to remove a reaction you've made"
"description": "Shown when you want to remove a reaction you've made"
},
"Reactions--error": {
"message": "Failed to send reaction. Please try again.",
@ -3152,7 +3152,7 @@
"description": "Shown in a toast when you successfully block a user and report them as spam"
},
"MessageRequests--block-direct-confirm-title": {
"message": "Block $name$?",
"message": "Block $title$?",
"description": "Shown as the title in the confirmation modal for blocking a private message request"
},
"MessageRequests--block-direct-confirm-body": {
@ -3160,7 +3160,7 @@
"description": "Shown as the body in the confirmation modal for blocking a private message request"
},
"MessageRequests--block-group-confirm-title": {
"message": "Block and Leave $group$?",
"message": "Block and Leave $title$?",
"description": "Shown as the title in the confirmation modal for blocking a group message request"
},
"MessageRequests--block-group-confirm-body": {
@ -3180,7 +3180,7 @@
"description": "Shown as the body in the confirmation modal for deleting a private message request"
},
"MessageRequests--delete-group-confirm-title": {
"message": "Delete and Leave $group$?",
"message": "Delete and Leave $title$?",
"description": "Shown as the title in the confirmation modal for deleting a group message request"
},
"MessageRequests--delete-direct": {
@ -6021,11 +6021,11 @@
},
"icu:GroupStorySettingsModal__remove_group": {
"messageformat": "Remove group story",
"descirption": "Stories settings > Group Story > button to remove group story"
"description": "Stories settings > Group Story > button to remove group story"
},
"icu:StoriesSettings__remove_group--confirm": {
"messageformat": "Are you sure you want to remove “{groupTitle}”?",
"descirption": "Stories settings > Group Story > confirm to remove group story"
"description": "Stories settings > Group Story > confirm to remove group story"
},
"SendStoryModal__choose-who-can-view": {
"message": "Choose who can view your story",
@ -6279,10 +6279,6 @@
"message": "Can’t download story. You will need to share it again.",
"description": "Description for image errors but when it is your own image"
},
"StoryCreator__error--video-too-long": {
"message": "Cannot post video to story because it is too long",
"description": "(deleted 02/22/2023) Error string for when a video post to story fails"
},
"StoryCreator__error--video-unsupported": {
"message": "Cannot post video to story as it is an unsupported file format",
"description": "Error string for when a video post to story fails"

2
ts/components/AddCaptionModal.tsx
View file

@ -63,7 +63,7 @@ export function AddCaptionModal({
hasFooterDivider={!isScrolledBottom}
moduleClassName="AddCaptionModal"
padded={false}
title="Add a message"
title={i18n('AddCaptionModal__title')}
onClose={onClose}
modalFooter={
<Button onClick={handleSubmit}>

12
ts/components/AddGroupMemberErrorDialog.tsx
View file

@ -37,17 +37,17 @@ export function AddGroupMemberErrorDialog(props: PropsType): JSX.Element {
case AddGroupMemberErrorDialogMode.MaximumGroupSize: {
const { maximumNumberOfContacts } = props;
title = i18n('chooseGroupMembers__maximum-group-size__title');
body = i18n('chooseGroupMembers__maximum-group-size__body', [
maximumNumberOfContacts.toString(),
]);
body = i18n('chooseGroupMembers__maximum-group-size__body', {
max: maximumNumberOfContacts.toString(),
});
break;
}
case AddGroupMemberErrorDialogMode.RecommendedMaximumGroupSize: {
const { recommendedMaximumNumberOfContacts } = props;
title = i18n('chooseGroupMembers__maximum-recommended-group-size__title');
body = i18n('chooseGroupMembers__maximum-recommended-group-size__body', [
recommendedMaximumNumberOfContacts.toString(),
]);
body = i18n('chooseGroupMembers__maximum-recommended-group-size__body', {
max: recommendedMaximumNumberOfContacts.toString(),
});
break;
}
default:

20
ts/components/AnnouncementsOnlyGroupBanner.tsx
View file

@ -54,15 +54,17 @@ export function AnnouncementsOnlyGroupBanner({
<Intl
i18n={i18n}
id="AnnouncementsOnlyGroupBanner--announcements-only"
components={[
<button
className="AnnouncementsOnlyGroupBanner__banner--admins"
type="button"
onClick={() => setIsShowingAdmins(true)}
>
{i18n('AnnouncementsOnlyGroupBanner--admins')}
</button>,
]}
components={{
admins: (
<button
className="AnnouncementsOnlyGroupBanner__banner--admins"
type="button"
onClick={() => setIsShowingAdmins(true)}
>
{i18n('AnnouncementsOnlyGroupBanner--admins')}
</button>
),
}}
/>
</div>
</>

4
ts/components/Avatar.tsx
View file

@ -283,7 +283,9 @@ export function Avatar({
return (
<div
aria-label={i18n('contactAvatarAlt', [title])}
aria-label={i18n('contactAvatarAlt', {
name: title,
})}
className={classNames(
'module-Avatar',
Boolean(storyRing) && 'module-Avatar--with-story',

4
ts/components/CallNeedPermissionScreen.tsx
View file

@ -64,7 +64,9 @@ export function CallNeedPermissionScreen({
<Intl
i18n={i18n}
id="callNeedPermission"
components={[<ContactName title={title} />]}
components={{
title: <ContactName title={title} />,
}}
/>
</p>

14
ts/components/CallScreen.tsx
View file

@ -118,7 +118,13 @@ function DirectCallHeaderMessage({
return <>{i18n('callReconnecting')}</>;
}
if (callState === CallState.Accepted && acceptedDuration) {
return <>{i18n('callDuration', [renderDuration(acceptedDuration)])}</>;
return (
<>
{i18n('callDuration', {
duration: renderDuration(acceptedDuration),
})}
</>
);
}
return null;
}
@ -312,9 +318,9 @@ export function CallScreen({
if (isRinging) {
headerTitle = undefined;
} else if (currentPresenter) {
headerTitle = i18n('calling__presenting--person-ongoing', [
currentPresenter.title,
]);
headerTitle = i18n('calling__presenting--person-ongoing', {
name: currentPresenter.title,
});
} else if (!activeCall.remoteParticipants.length) {
headerTitle = i18n('calling__in-this-call--zero');
}

12
ts/components/CallingHeader.tsx
View file

@ -49,15 +49,15 @@ export function CallingHeader({
{isGroupCall && participantCount ? (
<div className="module-calling-tools__button">
<Tooltip
content={i18n('calling__participants', [
String(participantCount),
])}
content={i18n('calling__participants', {
people: String(participantCount),
})}
theme={Theme.Dark}
>
<button
aria-label={i18n('calling__participants', [
String(participantCount),
])}
aria-label={i18n('calling__participants', {
people: String(participantCount),
})}
className={classNames(
'CallingButton__participants--container',
{

6
ts/components/CallingParticipantsList.tsx
View file

@ -83,9 +83,9 @@ export const CallingParticipantsList = React.memo(
{participants.length === 1 &&
i18n('calling__in-this-call--one')}
{participants.length > 1 &&
i18n('calling__in-this-call--many', [
String(participants.length),
])}
i18n('calling__in-this-call--many', {
people: String(participants.length),
})}
</div>
<button
type="button"

61
ts/components/CallingPreCallInfo.tsx
View file

@ -72,7 +72,9 @@ export function CallingPreCallInfo({
case 1:
subtitle = hasYou
? i18n('calling__pre-call-info--another-device-in-call')
: i18n('calling__pre-call-info--1-person-in-call', participantNames);
: i18n('calling__pre-call-info--1-person-in-call', {
first: participantNames[0],
});
break;
case 2:
subtitle = i18n('calling__pre-call-info--2-people-in-call', {
@ -117,42 +119,53 @@ export function CallingPreCallInfo({
subtitle = i18n('calling__pre-call-info--empty-group');
break;
case 1: {
const i18nValues = [memberNames[0]];
subtitle = ring
? i18n('calling__pre-call-info--will-ring-1', i18nValues)
: i18n('calling__pre-call-info--will-notify-1', i18nValues);
? i18n('calling__pre-call-info--will-ring-1', {
person: memberNames[0],
})
: i18n('calling__pre-call-info--will-notify-1', {
person: memberNames[0],
});
break;
}
case 2: {
const i18nValues = {
first: memberNames[0],
second: memberNames[1],
};
subtitle = ring
? i18n('calling__pre-call-info--will-ring-2', i18nValues)
: i18n('calling__pre-call-info--will-notify-2', i18nValues);
? i18n('calling__pre-call-info--will-ring-2', {
first: memberNames[0],
second: memberNames[1],
})
: i18n('calling__pre-call-info--will-notify-2', {
first: memberNames[0],
second: memberNames[1],
});
break;
}
case 3: {
const i18nValues = {
first: memberNames[0],
second: memberNames[1],
third: memberNames[2],
};
subtitle = ring
? i18n('calling__pre-call-info--will-ring-3', i18nValues)
: i18n('calling__pre-call-info--will-notify-3', i18nValues);
? i18n('calling__pre-call-info--will-ring-3', {
first: memberNames[0],
second: memberNames[1],
third: memberNames[2],
})
: i18n('calling__pre-call-info--will-notify-3', {
first: memberNames[0],
second: memberNames[1],
third: memberNames[2],
});
break;
}
default: {
const i18nValues = {
first: memberNames[0],
second: memberNames[1],
others: String(memberNames.length - 2),
};
subtitle = ring
? i18n('calling__pre-call-info--will-ring-many', i18nValues)
: i18n('calling__pre-call-info--will-notify-many', i18nValues);
? i18n('calling__pre-call-info--will-ring-many', {
first: memberNames[0],
second: memberNames[1],
others: String(memberNames.length - 2),
})
: i18n('calling__pre-call-info--will-notify-many', {
first: memberNames[0],
second: memberNames[1],
others: String(memberNames.length - 2),
});
break;
}
}

4
ts/components/CallingScreenSharingController.tsx
View file

@ -21,7 +21,9 @@ export function CallingScreenSharingController({
return (
<div className="module-CallingScreenSharingController">
<div className="module-CallingScreenSharingController__text">
{i18n('calling__presenting--info', [presentedSourceName])}
{i18n('calling__presenting--info', {
window: presentedSourceName,
})}
</div>
<div className="module-CallingScreenSharingController__buttons">
<Button

6
ts/components/CallingToastManager.tsx
View file

@ -77,9 +77,9 @@ function useScreenSharingToast({ activeCall, i18n }: PropsType): ToastType {
} else if (previousPresenterTitle) {
setResult({
type: 'dismissable',
message: i18n('calling__presenting--person-stopped', [
previousPresenterTitle,
]),
message: i18n('calling__presenting--person-stopped', {
name: previousPresenterTitle,
}),
});
}
}

6
ts/components/ChatColorPicker.tsx
View file

@ -348,9 +348,9 @@ function CustomColorBubble({
}}
title={i18n('ChatColorPicker__delete--title')}
>
{i18n('ChatColorPicker__delete--message', [
String(confirmDeleteCount),
])}
{i18n('ChatColorPicker__delete--message', {
num: String(confirmDeleteCount),
})}
</ConfirmationDialog>
) : null}
{isSelected ? (

4
ts/components/DialogUpdate.tsx
View file

@ -161,7 +161,9 @@ export function DialogUpdate({
}
const versionTitle = version
? i18n('DialogUpdate--version-available', [version])
? i18n('DialogUpdate--version-available', {
version,
})
: undefined;
if (dialogType === DialogType.Downloading) {

4
ts/components/GroupCallRemoteParticipant.tsx
View file

@ -269,7 +269,9 @@ export const GroupCallRemoteParticipant: React.FC<PropsType> = React.memo(
<Intl
i18n={i18n}
id="calling__you-have-blocked"
components={[<ContactName key="name" title={title} />]}
components={{
name: <ContactName key="name" title={title} />,
}}
/>
</div>
}

4
ts/components/GroupV2JoinDialog.tsx
View file

@ -93,7 +93,9 @@ export const GroupV2JoinDialog = React.memo(function GroupV2JoinDialogInner(
</div>
<div className="module-group-v2-join-dialog__title">{title}</div>
<div className="module-group-v2-join-dialog__metadata">
{i18n('GroupV2--join--group-metadata', [memberString])}
{i18n('GroupV2--join--group-metadata', {
memberCount: memberString,
})}
</div>
{groupDescription && (
<div className="module-group-v2-join-dialog__description">

4
ts/components/Inbox.tsx
View file

@ -188,7 +188,9 @@ export function Inbox({
</div>
<div className="message">
{loadingMessageCount
? i18n('loadingMessages', [String(loadingMessageCount)])
? i18n('loadingMessages', {
count: String(loadingMessageCount),
})
: i18n('loading')}
</div>
<div id="toast" />

14
ts/components/Intl.stories.tsx
View file

@ -35,17 +35,19 @@ NoReplacements.args = createProps({
export const SingleStringReplacement = Template.bind({});
SingleStringReplacement.args = createProps({
id: 'leftTheGroup',
components: ['Theodora'],
components: { name: 'Theodora' },
});
export const SingleTagReplacement = Template.bind({});
SingleTagReplacement.args = createProps({
id: 'leftTheGroup',
components: [
<button type="button" key="a-button">
Theodora
</button>,
],
components: {
name: (
<button type="button" key="a-button">
Theodora
</button>
),
},
});
export const MultipleStringReplacement = Template.bind({});

5
ts/components/Intl.tsx
View file

@ -16,10 +16,7 @@ export type FullJSXType =
| ReactNode
| JSX.Element
| string;
export type IntlComponentsType =
| undefined
| Array<FullJSXType>
| ReplacementValuesType<FullJSXType>;
export type IntlComponentsType = undefined | ReplacementValuesType<FullJSXType>;
export type Props = {
/** The translation string id */

8
ts/components/NewlyCreatedGroupInvitedContactsDialog.tsx
View file

@ -39,7 +39,7 @@ export function NewlyCreatedGroupInvitedContactsDialog({
<Intl
i18n={i18n}
id="NewlyCreatedGroupInvitedContactsDialog--body--user-paragraph--one"
components={[<ContactName title={contact.title} />]}
components={{ name: <ContactName title={contact.title} /> }}
/>
</GroupDialog.Paragraph>
<GroupDialog.Paragraph>
@ -48,9 +48,9 @@ export function NewlyCreatedGroupInvitedContactsDialog({
</>
);
} else {
title = i18n('NewlyCreatedGroupInvitedContactsDialog--title--many', [
contacts.length.toString(),
]);
title = i18n('NewlyCreatedGroupInvitedContactsDialog--title--many', {
count: contacts.length.toString(),
});
body = (
<>
<GroupDialog.Paragraph>

12
ts/components/Preferences.tsx
View file

@ -874,12 +874,12 @@ export function Preferences({
left={i18n('Preferences--blocked')}
right={
blockedCount === 1
? i18n('Preferences--blocked-count-singular', [
String(blockedCount),
])
: i18n('Preferences--blocked-count-plural', [
String(blockedCount || 0),
])
? i18n('Preferences--blocked-count-singular', {
num: String(blockedCount),
})
: i18n('Preferences--blocked-count-plural', {
num: String(blockedCount || 0),
})
}
/>
</SettingsRow>

10
ts/components/SafetyNumberViewer.tsx
View file

@ -73,7 +73,7 @@ export function SafetyNumberViewer({
<div className="module-SafetyNumberViewer__number">
{safetyNumber || getPlaceholder()}
</div>
<Intl i18n={i18n} id="verifyHelp" components={[boldName]} />
<Intl i18n={i18n} id="verifyHelp" components={{ name: boldName }} />
<div className="module-SafetyNumberViewer__verification-status">
{isVerified ? (
<span className="module-SafetyNumberViewer__icon--verified" />
@ -81,9 +81,13 @@ export function SafetyNumberViewer({
<span className="module-SafetyNumberViewer__icon--shield" />
)}
{isVerified ? (
<Intl i18n={i18n} id="isVerified" components={[boldName]} />
<Intl i18n={i18n} id="isVerified" components={{ name: boldName }} />
) : (
<Intl i18n={i18n} id="isNotVerified" components={[boldName]} />
<Intl
i18n={i18n}
id="isNotVerified"
components={{ name: boldName }}
/>
)}
</div>
<div className="module-SafetyNumberViewer__button">

6
ts/components/SendStoryModal.tsx
View file

@ -996,9 +996,9 @@ export function SendStoryModal({
}}
theme={Theme.Dark}
>
{i18n('StoriesSettings__delete-list--confirm', [
confirmDeleteList.name,
])}
{i18n('StoriesSettings__delete-list--confirm', {
name: confirmDeleteList.name,
})}
</ConfirmationDialog>
)}
{confirmDiscardModal}

18
ts/components/StoriesSettingsModal.tsx
View file

@ -507,9 +507,9 @@ export function StoriesSettingsModal({
}}
theme={Theme.Dark}
>
{i18n('StoriesSettings__delete-list--confirm', [
confirmDeleteList.name,
])}
{i18n('StoriesSettings__delete-list--confirm', {
name: confirmDeleteList.name,
})}
</ConfirmationDialog>
)}
{confirmRemoveGroup != null && (
@ -687,9 +687,9 @@ export function DistributionListSettingsModal({
</span>
<button
aria-label={i18n('StoriesSettings__remove--title', [
member.title,
])}
aria-label={i18n('StoriesSettings__remove--title', {
title: member.title,
})}
className="StoriesSettingsModal__list__delete"
onClick={() => {
strictAssert(member.uuid, 'Story member was missing uuid');
@ -753,9 +753,9 @@ export function DistributionListSettingsModal({
setConfirmRemoveMember(undefined);
}}
theme={Theme.Dark}
title={i18n('StoriesSettings__remove--title', [
confirmRemoveMember.title,
])}
title={i18n('StoriesSettings__remove--title', {
title: confirmRemoveMember.title,
})}
>
{i18n('StoriesSettings__remove--body')}
</ConfirmationDialog>

46
ts/components/StoryDetailsModal.tsx
View file

@ -244,14 +244,16 @@ export function StoryDetailsModal({
<Intl
i18n={i18n}
id="StoryDetailsModal__sent-time"
components={[
<Time
className="StoryDetailsModal__debugger__button__text"
timestamp={timestamp}
>
{formatDateTimeLong(i18n, timestamp)}
</Time>,
]}
components={{
time: (
<Time
className="StoryDetailsModal__debugger__button__text"
timestamp={timestamp}
>
{formatDateTimeLong(i18n, timestamp)}
</Time>
),
}}
/>
</div>
{attachment && (
@ -259,11 +261,13 @@ export function StoryDetailsModal({
<Intl
i18n={i18n}
id="StoryDetailsModal__file-size"
components={[
<span className="StoryDetailsModal__debugger__button__text">
{formatFileSize(attachment.size)}
</span>,
]}
components={{
size: (
<span className="StoryDetailsModal__debugger__button__text">
{formatFileSize(attachment.size)}
</span>
),
}}
/>
</div>
)}
@ -272,13 +276,15 @@ export function StoryDetailsModal({
<Intl
i18n={i18n}
id="StoryDetailsModal__disappears-in"
components={[
<span className="StoryDetailsModal__debugger__button__text">
{formatRelativeTime(i18n, timeRemaining, {
largest: 2,
})}
</span>,
]}
components={{
countdown: (
<span className="StoryDetailsModal__debugger__button__text">
{formatRelativeTime(i18n, timeRemaining, {
largest: 2,
})}
</span>
),
}}
/>
</div>
)}

8
ts/components/StoryImage.tsx
View file

@ -158,7 +158,13 @@ export function StoryImage({
if (isMe) {
content = <>{i18n('StoryImage__error--you')}</>;
} else {
content = <>{i18n('StoryImage__error2', [firstName])}</>;
content = (
<>
{i18n('StoryImage__error2', {
name: firstName,
})}
</>
);
}
}

4
ts/components/StoryLinkPreview.tsx
View file

@ -73,7 +73,9 @@ export function StoryLinkPreview({
{isImage && image ? (
<div className="StoryLinkPreview__icon-container">
<Image
alt={i18n('stagedPreviewThumbnail', [location])}
alt={i18n('stagedPreviewThumbnail', {
domain: location,
})}
attachment={image}
curveBottomLeft={CurveType.Tiny}
curveBottomRight={CurveType.Tiny}

4
ts/components/StoryListItem.tsx
View file

@ -216,7 +216,9 @@ export function StoryListItem({
setHasConfirmHideStory(false);
}}
>
{i18n('StoryListItem__hide-modal--body', [String(firstName)])}
{i18n('StoryListItem__hide-modal--body', {
name: String(firstName),
})}
</ConfirmationDialog>
)}
</>

12
ts/components/StoryViewer.tsx
View file

@ -857,13 +857,13 @@ export function StoryViewer({
<Intl
i18n={i18n}
id="MyStories__views--singular"
components={[<strong>{viewCount}</strong>]}
components={{ num: <strong>{viewCount}</strong> }}
/>
) : (
<Intl
i18n={i18n}
id="MyStories__views--plural"
components={[<strong>{viewCount}</strong>]}
components={{ num: <strong>{viewCount}</strong> }}
/>
))}
{(isSent || viewCount > 0) && replyCount > 0 && ' '}
@ -872,13 +872,13 @@ export function StoryViewer({
<Intl
i18n={i18n}
id="MyStories__replies--singular"
components={[<strong>{replyCount}</strong>]}
components={{ num: <strong>{replyCount}</strong> }}
/>
) : (
<Intl
i18n={i18n}
id="MyStories__replies--plural"
components={[<strong>{replyCount}</strong>]}
components={{ num: <strong>{replyCount}</strong> }}
/>
))}
</span>
@ -978,7 +978,9 @@ export function StoryViewer({
setHasConfirmHideStory(false);
}}
>
{i18n('StoryListItem__hide-modal--body', [String(firstName)])}
{i18n('StoryListItem__hide-modal--body', {
name: String(firstName),
})}
</ConfirmationDialog>
)}
{confirmDeleteStory && (

16
ts/components/WhatsNewLink.tsx
View file

@ -19,11 +19,17 @@ export function WhatsNewLink(props: PropsType): JSX.Element {
<Intl
i18n={i18n}
id="whatsNew"
components={[
<button className="WhatsNew" type="button" onClick={showWhatsNewModal}>
{i18n('viewReleaseNotes')}
</button>,
]}
components={{
whatsNew: (
<button
className="WhatsNew"
type="button"
onClick={showWhatsNewModal}
>
{i18n('viewReleaseNotes')}
</button>
),
}}
/>
);
}

6
ts/components/conversation/AttachmentList.tsx
View file

@ -102,9 +102,9 @@ export function AttachmentList<T extends AttachmentType | AttachmentDraftType>({
const imgElement = (
<Image
key={key}
alt={i18n('stagedImageAttachment', [
attachment.fileName || url || index.toString(),
])}
alt={i18n('stagedImageAttachment', {
path: attachment.fileName || url || index.toString(),
})}
className="module-staged-attachment"
i18n={i18n}
attachment={attachment}

4
ts/components/conversation/CallingNotification.tsx
View file

@ -140,7 +140,9 @@ function renderCallingNotificationButton(
buttonText = i18n('calling__call-is-full');
disabledTooltipText = i18n(
'calling__call-notification__button__call-full-tooltip',
[String(deviceCount)]
{
max: String(deviceCount),
}
);
onClick = noop;
} else {

2
ts/components/conversation/ContactDetail.tsx
View file

@ -80,7 +80,7 @@ export class ContactDetail extends React.Component<Props> {
onSendMessage,
}: {
hasSignalAccount: boolean;
i18n: (key: string, values?: Array<string>) => string;
i18n: LocalizerType;
onSendMessage: () => void;
}): JSX.Element | null {
if (!hasSignalAccount) {

8
ts/components/conversation/ContactModal.tsx
View file

@ -125,8 +125,12 @@ export function ContactModal({
onClose={() => setSubModalState(SubModalState.None)}
>
{isAdmin
? i18n('ContactModal--rm-admin-info', [contact.title])
: i18n('ContactModal--make-admin-info', [contact.title])}
? i18n('ContactModal--rm-admin-info', {
contact: contact.title,
})
: i18n('ContactModal--make-admin-info', {
contact: contact.title,
})}
</ConfirmationDialog>
);
break;

6
ts/components/conversation/ContactSpoofingReviewDialog.tsx
View file

@ -250,9 +250,9 @@ export function ContactSpoofingReviewDialog(props: PropsType): JSX.Element {
contents = (
<>
<p>
{i18n('ContactSpoofingReviewDialog__group__description', [
conversationInfos.length.toString(),
])}
{i18n('ContactSpoofingReviewDialog__group__description', {
count: conversationInfos.length.toString(),
})}
</p>
<h2>{i18n('ContactSpoofingReviewDialog__group__members-header')}</h2>
{conversationInfos.map((conversationInfo, index) => {

16
ts/components/conversation/GroupNotification.tsx
View file

@ -66,7 +66,11 @@ export class GroupNotification extends React.Component<Props> {
switch (type) {
case 'name':
return (
<Intl i18n={i18n} id="titleIsNow" components={[newName || '']} />
<Intl
i18n={i18n}
id="titleIsNow"
components={{ name: newName || '' }}
/>
);
case 'avatar':
return <Intl i18n={i18n} id="updatedGroupAvatar" />;
@ -83,13 +87,13 @@ export class GroupNotification extends React.Component<Props> {
<Intl
i18n={i18n}
id="joinedTheGroup"
components={[otherPeopleWithCommas]}
components={{ name: otherPeopleWithCommas }}
/>
) : (
<Intl
i18n={i18n}
id="multipleJoinedTheGroup"
components={[otherPeopleWithCommas]}
components={{ names: otherPeopleWithCommas }}
/>
)}
</>
@ -114,13 +118,13 @@ export class GroupNotification extends React.Component<Props> {
<Intl
id="multipleLeftTheGroup"
i18n={i18n}
components={[otherPeopleWithCommas]}
components={{ name: otherPeopleWithCommas }}
/>
) : (
<Intl
id="leftTheGroup"
i18n={i18n}
components={[otherPeopleWithCommas]}
components={{ name: otherPeopleWithCommas }}
/>
);
case 'general':
@ -147,7 +151,7 @@ export class GroupNotification extends React.Component<Props> {
<Intl
i18n={i18n}
id="updatedTheGroup"
components={[<ContactName title={from.title} />]}
components={{ name: <ContactName title={from.title} /> }}
/>
);

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

@ -118,11 +118,19 @@ function renderUsers(
<Intl
i18n={i18n}
id={`${keyPrefix}--one`}
components={[<ContactName title={members[0].title} />]}
components={{
contact: <ContactName title={members[0].title} />,
}}
/>
</p>
);
}
return <p>{i18n(`${keyPrefix}--many`, [members.length.toString()])}</p>;
return (
<p>
{i18n(`${keyPrefix}--many`, {
count: members.length.toString(),
})}
</p>
);
}

2
ts/components/conversation/GroupV2Change.tsx
View file

@ -55,7 +55,7 @@ export type PropsType = PropsDataType &
function renderStringToIntl(
id: string,
i18n: LocalizerType,
components?: Array<FullJSXType> | ReplacementValuesType<FullJSXType>
components?: ReplacementValuesType<FullJSXType>
): FullJSXType {
// eslint-disable-next-line local-rules/valid-i18n-keys
return <Intl id={id} i18n={i18n} components={components} />;

4
ts/components/conversation/LastSeenIndicator.tsx
View file

@ -15,7 +15,9 @@ export const LastSeenIndicator = forwardRef<HTMLDivElement, Props>(
const message =
count === 1
? i18n('unreadMessage')
: i18n('unreadMessages', [String(count)]);
: i18n('unreadMessages', {
count: String(count),
});
return (
<div className="module-last-seen-indicator" ref={ref}>

8
ts/components/conversation/Message.tsx
View file

@ -1162,7 +1162,9 @@ export class Message extends React.PureComponent<Props, State> {
curveBottomRight={CurveType.Tiny}
curveTopRight={CurveType.Tiny}
curveTopLeft={CurveType.Tiny}
alt={i18n('previewThumbnail', [first.domain])}
alt={i18n('previewThumbnail', {
domain: first.domain,
})}
height={72}
width={72}
url={first.image.url}
@ -1536,7 +1538,9 @@ export class Message extends React.PureComponent<Props, State> {
<>
{storyReplyContext.emoji && (
<div className="module-message__quote-story-reaction-header">
{i18n('Quote__story-reaction', [storyReplyContext.authorTitle])}
{i18n('Quote__story-reaction', {
name: storyReplyContext.authorTitle,
})}
</div>
)}
<Quote

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

@ -58,18 +58,20 @@ export function MessageRequestActions({
id={`MessageRequests--message-${conversationType}${
isBlocked ? '-blocked' : ''
}`}
components={[
<strong
key="name"
className="module-message-request-actions__message__name"
>
<ContactName
firstName={firstName}
title={title}
preferFirstName
/>
</strong>,
]}
components={{
name: (
<strong
key="name"
className="module-message-request-actions__message__name"
>
<ContactName
firstName={firstName}
title={title}
preferFirstName
/>
</strong>
),
}}
/>
</p>
<div className="module-message-request-actions__buttons">

8
ts/components/conversation/MessageRequestActionsConfirmation.tsx
View file

@ -52,7 +52,9 @@ export function MessageRequestActionsConfirmation({
<Intl
i18n={i18n}
id={`MessageRequests--block-${conversationType}-confirm-title`}
components={[<ContactName key="name" title={title} />]}
components={{
title: <ContactName key="name" title={title} />,
}}
/>
}
actions={[
@ -119,7 +121,9 @@ export function MessageRequestActionsConfirmation({
<Intl
i18n={i18n}
id={`MessageRequests--delete-${conversationType}-confirm-title`}
components={[<ContactName key="name" title={title} />]}
components={{
title: <ContactName key="name" title={title} />,
}}
/>
}
actions={[

24
ts/components/conversation/SafetyNumberNotification.tsx
View file

@ -46,17 +46,19 @@ export function SafetyNumberNotification({
// eslint-disable-next-line local-rules/valid-i18n-keys
<Intl
id={changeKey}
components={[
<span
key="external-1"
className="module-safety-number-notification__contact"
>
<ContactName
title={contact.title}
module="module-safety-number-notification__contact"
/>
</span>,
]}
components={{
name: (
<span
key="external-1"
className="module-safety-number-notification__contact"
>
<ContactName
title={contact.title}
module="module-safety-number-notification__contact"
/>
</span>
),
}}
i18n={i18n}
/>
}

4
ts/components/conversation/StagedLinkPreview.tsx
View file

@ -86,7 +86,9 @@ export function StagedLinkPreview({
{isLoaded && image && isImage && domain ? (
<div className={getClassName('__icon-container')}>
<Image
alt={i18n('stagedPreviewThumbnail', [domain])}
alt={i18n('stagedPreviewThumbnail', {
domain,
})}
attachment={image}
curveBottomLeft={CurveType.Tiny}
curveBottomRight={CurveType.Tiny}

12
ts/components/conversation/TimerNotification.tsx
View file

@ -69,17 +69,23 @@ export function TimerNotification(props: Props): JSX.Element {
case 'fromMe':
message = disabled
? i18n('youDisabledDisappearingMessages')
: i18n('youChangedTheTimer', [timespan]);
: i18n('youChangedTheTimer', {
time: timespan,
});
break;
case 'fromSync':
message = disabled
? i18n('disappearingMessagesDisabled')
: i18n('timerSetOnSync', [timespan]);
: i18n('timerSetOnSync', {
time: timespan,
});
break;
case 'fromMember':
message = disabled
? i18n('disappearingMessagesDisabledByMember')
: i18n('timerSetByMember', [timespan]);
: i18n('timerSetByMember', {
time: timespan,
});
break;
default:
log.warn('TimerNotification: unsupported type provided:', type);

24
ts/components/conversation/UnsupportedMessage.tsx
View file

@ -53,17 +53,19 @@ export function UnsupportedMessage({
// eslint-disable-next-line local-rules/valid-i18n-keys
<Intl
id={stringId}
components={[
<span
key="external-1"
className="module-unsupported-message__contact"
>
<ContactName
title={contact.title}
module="module-unsupported-message__contact"
/>
</span>,
]}
components={{
contact: (
<span
key="external-1"
className="module-unsupported-message__contact"
>
<ContactName
title={contact.title}
module="module-unsupported-message__contact"
/>
</span>
),
}}
i18n={i18n}
/>
}

16
ts/components/conversation/VerificationNotification.tsx
View file

@ -50,13 +50,15 @@ export class VerificationNotification extends React.Component<Props> {
// eslint-disable-next-line local-rules/valid-i18n-keys
<Intl
id={id}
components={[
<ContactName
key="external-1"
title={contact.title}
module="module-verification-notification__contact"
/>,
]}
components={{
name: (
<ContactName
key="external-1"
title={contact.title}
module="module-verification-notification__contact"
/>
),
}}
i18n={i18n}
/>
);

24
ts/components/conversation/conversation-details/ConversationDetailsActions.tsx
View file

@ -201,9 +201,9 @@ export function ConversationDetailsActions({
]}
i18n={i18n}
onClose={() => gGroupBlock(false)}
title={i18n('ConversationDetailsActions--block-group-modal-title', [
conversationTitle,
])}
title={i18n('ConversationDetailsActions--block-group-modal-title', {
groupName: conversationTitle,
})}
>
{i18n('ConversationDetailsActions--block-group-modal-content')}
</ConfirmationDialog>
@ -222,9 +222,9 @@ export function ConversationDetailsActions({
]}
i18n={i18n}
onClose={() => gGroupUnblock(false)}
title={i18n('ConversationDetailsActions--unblock-group-modal-title', [
conversationTitle,
])}
title={i18n('ConversationDetailsActions--unblock-group-modal-title', {
groupName: conversationTitle,
})}
>
{i18n('ConversationDetailsActions--unblock-group-modal-content')}
</ConfirmationDialog>
@ -242,9 +242,9 @@ export function ConversationDetailsActions({
]}
i18n={i18n}
onClose={() => gDirectBlock(false)}
title={i18n('MessageRequests--block-direct-confirm-title', [
conversationTitle,
])}
title={i18n('MessageRequests--block-direct-confirm-title', {
name: conversationTitle,
})}
>
{i18n('MessageRequests--block-direct-confirm-body')}
</ConfirmationDialog>
@ -261,9 +261,9 @@ export function ConversationDetailsActions({
]}
i18n={i18n}
onClose={() => gDirectUnblock(false)}
title={i18n('MessageRequests--unblock-direct-confirm-title', [
conversationTitle,
])}
title={i18n('MessageRequests--unblock-direct-confirm-title', {
name: conversationTitle,
})}
>
{i18n('MessageRequests--unblock-direct-confirm-body')}
</ConfirmationDialog>

6
ts/components/conversation/conversation-details/ConversationDetailsHeader.tsx
View file

@ -66,9 +66,9 @@ export function ConversationDetailsHeader({
} else if (canEdit) {
subtitle = i18n('ConversationDetailsHeader--add-group-description');
} else {
subtitle = i18n('ConversationDetailsHeader--members', [
memberships.length.toString(),
]);
subtitle = i18n('ConversationDetailsHeader--members', {
number: memberships.length.toString(),
});
}
} else if (!isMe) {
subtitle = (

6
ts/components/conversation/conversation-details/ConversationDetailsMembershipList.tsx
View file

@ -93,9 +93,9 @@ export function ConversationDetailsMembershipList({
return (
<PanelSection
title={i18n('ConversationDetailsMembershipList--title', [
sortedMemberships.length.toString(),
])}
title={i18n('ConversationDetailsMembershipList--title', {
number: sortedMemberships.length.toString(),
})}
>
{canAddNewMembers && (
<PanelRow

10
ts/components/conversation/conversation-details/PendingInvites.tsx
View file

@ -403,7 +403,9 @@ function MembersPendingAdminApproval({
/>
))}
<div className="ConversationDetails__pending--info">
{i18n('PendingRequests--info', [conversation.title])}
{i18n('PendingRequests--info', {
name: conversation.title,
})}
</div>
</PanelSection>
);
@ -501,9 +503,9 @@ function MembersPendingProfileKey({
/>
}
label={member.title}
right={i18n('PendingInvites--invited-count', [
pendingMemberships.length.toString(),
])}
right={i18n('PendingInvites--invited-count', {
number: pendingMemberships.length.toString(),
})}
actions={
conversation.areWeAdmin ? (
<ConversationDetailsIcon

12
ts/components/conversationList/BaseConversationListItem.tsx
View file

@ -132,11 +132,17 @@ export const BaseConversationListItem: FunctionComponent<PropsType> =
} else if (isCheckbox) {
let ariaLabel: string;
if (disabled) {
ariaLabel = i18n('cannotSelectContact', [title]);
ariaLabel = i18n('cannotSelectContact', {
name: title,
});
} else if (checked) {
ariaLabel = i18n('deselectContact', [title]);
ariaLabel = i18n('deselectContact', {
name: title,
});
} else {
ariaLabel = i18n('selectContact', [title]);
ariaLabel = i18n('selectContact', {
name: title,
});
}
actionNode = (
<div className={CHECKBOX_CONTAINER_CLASS_NAME}>

4
ts/components/emoji/EmojiPicker.tsx
View file

@ -480,7 +480,9 @@ export const EmojiPicker = React.memo(
handlePickTone(event);
}
}}
title={i18n('EmojiPicker--skin-tone', [`${tone}`])}
title={i18n('EmojiPicker--skin-tone', {
tone: `${tone}`,
})}
className={classNames(
'module-emoji-picker__button',
'module-emoji-picker__button--footer',

6
ts/components/leftPane/LeftPaneSearchHelper.tsx
View file

@ -161,7 +161,11 @@ export class LeftPaneSearchHelper extends LeftPaneHelper<LeftPaneSearchPropsType
} else {
noResults = (
<>
<div>{i18n('noSearchResults', [searchTerm])}</div>
<div>
{i18n('noSearchResults', {
searchTerm,
})}
</div>
{primarySendsSms && (
<div className="module-left-pane__no-search-results__sms-only">
{i18n('noSearchResults--sms-only')}

276
ts/groupChange.ts
View file

@ -14,7 +14,7 @@ export type SmartContactRendererType<T> = (uuid: UUIDStringType) => T | string;
export type StringRendererType<T> = (
id: string,
i18n: LocalizerType,
components?: Array<T | string> | ReplacementValuesType<T | string>
components?: ReplacementValuesType<T | string>
) => T | string;
export type RenderOptionsType<T> = {
@ -93,7 +93,7 @@ export function renderChangeDetail<T>(
if (newTitle) {
if (fromYou) {
return renderString('GroupV2--title--change--you', i18n, [newTitle]);
return renderString('GroupV2--title--change--you', i18n, { newTitle });
}
if (from) {
return renderString('GroupV2--title--change--other', i18n, {
@ -101,15 +101,17 @@ export function renderChangeDetail<T>(
newTitle,
});
}
return renderString('GroupV2--title--change--unknown', i18n, [newTitle]);
return renderString('GroupV2--title--change--unknown', i18n, {
newTitle,
});
}
if (fromYou) {
return renderString('GroupV2--title--remove--you', i18n);
}
if (from) {
return renderString('GroupV2--title--remove--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--title--remove--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--title--remove--unknown', i18n);
}
@ -119,9 +121,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--avatar--remove--you', i18n);
}
if (from) {
return renderString('GroupV2--avatar--remove--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--avatar--remove--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--avatar--remove--unknown', i18n);
}
@ -129,9 +131,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--avatar--change--you', i18n);
}
if (from) {
return renderString('GroupV2--avatar--change--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--avatar--change--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--avatar--change--unknown', i18n);
}
@ -143,9 +145,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--access-attributes--admins--you', i18n);
}
if (from) {
return renderString('GroupV2--access-attributes--admins--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--access-attributes--admins--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--access-attributes--admins--unknown', i18n);
}
@ -154,9 +156,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--access-attributes--all--you', i18n);
}
if (from) {
return renderString('GroupV2--access-attributes--all--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--access-attributes--all--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--access-attributes--all--unknown', i18n);
}
@ -173,9 +175,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--access-members--admins--you', i18n);
}
if (from) {
return renderString('GroupV2--access-members--admins--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--access-members--admins--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--access-members--admins--unknown', i18n);
}
@ -184,9 +186,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--access-members--all--you', i18n);
}
if (from) {
return renderString('GroupV2--access-members--all--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--access-members--all--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--access-members--all--unknown', i18n);
}
@ -206,7 +208,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--access-invite-link--enabled--other',
i18n,
[renderContact(from)]
{ adminName: renderContact(from) }
);
}
return renderString(
@ -222,7 +224,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--access-invite-link--disabled--other',
i18n,
[renderContact(from)]
{ adminName: renderContact(from) }
);
}
return renderString(
@ -244,16 +246,16 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--member-add--you--you', i18n);
}
if (from) {
return renderString('GroupV2--member-add--you--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--member-add--you--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--member-add--you--unknown', i18n);
}
if (fromYou) {
return renderString('GroupV2--member-add--other--you', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--member-add--other--you', i18n, {
memberName: renderContact(uuid),
});
}
if (from) {
return renderString('GroupV2--member-add--other--other', i18n, {
@ -261,9 +263,9 @@ export function renderChangeDetail<T>(
addeeName: renderContact(uuid),
});
}
return renderString('GroupV2--member-add--other--unknown', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--member-add--other--unknown', i18n, {
memberName: renderContact(uuid),
});
}
if (detail.type === 'member-add-from-invite') {
const { uuid, inviter } = detail;
@ -274,9 +276,9 @@ export function renderChangeDetail<T>(
if (weAreJoiner) {
// They can't be the same, no fromYou check here
if (from) {
return renderString('GroupV2--member-add--you--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--member-add--you--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--member-add--you--unknown', i18n);
}
@ -299,9 +301,9 @@ export function renderChangeDetail<T>(
if (weAreJoiner) {
if (inviter) {
return renderString('GroupV2--member-add--from-invite--you', i18n, [
renderContact(inviter),
]);
return renderString('GroupV2--member-add--from-invite--you', i18n, {
inviterName: renderContact(inviter),
});
}
return renderString(
'GroupV2--member-add--from-invite--you-no-from',
@ -309,9 +311,9 @@ export function renderChangeDetail<T>(
);
}
if (weAreInviter) {
return renderString('GroupV2--member-add--from-invite--from-you', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--member-add--from-invite--from-you', i18n, {
inviteeName: renderContact(uuid),
});
}
if (inviter) {
return renderString('GroupV2--member-add--from-invite--other', i18n, {
@ -334,17 +336,17 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--member-add-from-link--you--you', i18n);
}
if (from && uuid === from) {
return renderString('GroupV2--member-add-from-link--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--member-add-from-link--other', i18n, {
memberName: renderContact(from),
});
}
// Note: this shouldn't happen, because we only capture 'add-from-link' status
// from group change events, which always have a sender.
log.warn('member-add-from-link change type; we have no from!');
return renderString('GroupV2--member-add--other--unknown', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--member-add--other--unknown', i18n, {
memberName: renderContact(uuid),
});
}
if (detail.type === 'member-add-from-admin-approval') {
const { uuid } = detail;
@ -355,7 +357,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-add-from-admin-approval--you--other',
i18n,
[renderContact(from)]
{ adminName: renderContact(from) }
);
}
@ -374,7 +376,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-add-from-admin-approval--other--you',
i18n,
[renderContact(uuid)]
{ joinerName: renderContact(uuid) }
);
}
if (from) {
@ -394,7 +396,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-add-from-admin-approval--other--unknown',
i18n,
[renderContact(uuid)]
{ joinerName: renderContact(uuid) }
);
}
if (detail.type === 'member-remove') {
@ -406,22 +408,22 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--member-remove--you--you', i18n);
}
if (from) {
return renderString('GroupV2--member-remove--you--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--member-remove--you--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--member-remove--you--unknown', i18n);
}
if (fromYou) {
return renderString('GroupV2--member-remove--other--you', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--member-remove--other--you', i18n, {
memberName: renderContact(uuid),
});
}
if (from && from === uuid) {
return renderString('GroupV2--member-remove--other--self', i18n, [
renderContact(from),
]);
return renderString('GroupV2--member-remove--other--self', i18n, {
memberName: renderContact(from),
});
}
if (from) {
return renderString('GroupV2--member-remove--other--other', i18n, {
@ -429,9 +431,9 @@ export function renderChangeDetail<T>(
memberName: renderContact(uuid),
});
}
return renderString('GroupV2--member-remove--other--unknown', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--member-remove--other--unknown', i18n, {
memberName: renderContact(uuid),
});
}
if (detail.type === 'member-privilege') {
const { uuid, newPrivilege } = detail;
@ -443,7 +445,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-privilege--promote--you--other',
i18n,
[renderContact(from)]
{ adminName: renderContact(from) }
);
}
@ -457,7 +459,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-privilege--promote--other--you',
i18n,
[renderContact(uuid)]
{ memberName: renderContact(uuid) }
);
}
if (from) {
@ -473,7 +475,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-privilege--promote--other--unknown',
i18n,
[renderContact(uuid)]
{ memberName: renderContact(uuid) }
);
}
if (newPrivilege === RoleEnum.DEFAULT) {
@ -482,7 +484,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-privilege--demote--you--other',
i18n,
[renderContact(from)]
{ adminName: renderContact(from) }
);
}
return renderString(
@ -495,7 +497,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-privilege--demote--other--you',
i18n,
[renderContact(uuid)]
{ memberName: renderContact(uuid) }
);
}
if (from) {
@ -511,7 +513,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--member-privilege--demote--other--unknown',
i18n,
[renderContact(uuid)]
{ memberName: renderContact(uuid) }
);
}
log.warn(
@ -524,21 +526,21 @@ export function renderChangeDetail<T>(
const weAreInvited = isOurUuid(uuid);
if (weAreInvited) {
if (from) {
return renderString('GroupV2--pending-add--one--you--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--pending-add--one--you--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--pending-add--one--you--unknown', i18n);
}
if (fromYou) {
return renderString('GroupV2--pending-add--one--other--you', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--pending-add--one--other--you', i18n, {
inviteeName: renderContact(uuid),
});
}
if (from) {
return renderString('GroupV2--pending-add--one--other--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--pending-add--one--other--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--pending-add--one--other--unknown', i18n);
}
@ -546,9 +548,9 @@ export function renderChangeDetail<T>(
const { count } = detail;
if (fromYou) {
return renderString('GroupV2--pending-add--many--you', i18n, [
count.toString(),
]);
return renderString('GroupV2--pending-add--many--you', i18n, {
count: count.toString(),
});
}
if (from) {
return renderString('GroupV2--pending-add--many--other', i18n, {
@ -556,9 +558,9 @@ export function renderChangeDetail<T>(
count: count.toString(),
});
}
return renderString('GroupV2--pending-add--many--unknown', i18n, [
count.toString(),
]);
return renderString('GroupV2--pending-add--many--unknown', i18n, {
count: count.toString(),
});
}
if (detail.type === 'pending-remove-one') {
const { inviter, uuid } = detail;
@ -569,15 +571,15 @@ export function renderChangeDetail<T>(
if (weAreInviter) {
if (sentByInvited) {
return renderString('GroupV2--pending-remove--decline--you', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--pending-remove--decline--you', i18n, {
inviteeName: renderContact(uuid),
});
}
if (fromYou) {
return renderString(
'GroupV2--pending-remove--revoke-invite-from-you--one--you',
i18n,
[renderContact(uuid)]
{ inviteeName: renderContact(uuid) }
);
}
if (from) {
@ -593,7 +595,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--pending-remove--revoke-invite-from-you--one--unknown',
i18n,
[renderContact(uuid)]
{ inviteeName: renderContact(uuid) }
);
}
if (sentByInvited) {
@ -601,9 +603,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--pending-remove--decline--from-you', i18n);
}
if (inviter) {
return renderString('GroupV2--pending-remove--decline--other', i18n, [
renderContact(inviter),
]);
return renderString('GroupV2--pending-remove--decline--other', i18n, {
memberName: renderContact(inviter),
});
}
return renderString('GroupV2--pending-remove--decline--unknown', i18n);
}
@ -612,13 +614,13 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--pending-remove--revoke-own--to-you',
i18n,
[renderContact(inviter)]
{ inviterName: renderContact(inviter) }
);
}
return renderString(
'GroupV2--pending-remove--revoke-own--unknown',
i18n,
[renderContact(inviter)]
{ inviterName: renderContact(inviter) }
);
}
if (inviter) {
@ -626,7 +628,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--pending-remove--revoke-invite-from--one--you',
i18n,
[renderContact(inviter)]
{ memberName: renderContact(inviter) }
);
}
if (from) {
@ -642,16 +644,16 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--pending-remove--revoke-invite-from--one--unknown',
i18n,
[renderContact(inviter)]
{ memberName: renderContact(inviter) }
);
}
if (fromYou) {
return renderString('GroupV2--pending-remove--revoke--one--you', i18n);
}
if (from) {
return renderString('GroupV2--pending-remove--revoke--one--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--pending-remove--revoke--one--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--pending-remove--revoke--one--unknown', i18n);
}
@ -664,7 +666,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--pending-remove--revoke-invite-from-you--many--you',
i18n,
[count.toString()]
{ count: count.toString() }
);
}
if (from) {
@ -680,7 +682,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--pending-remove--revoke-invite-from-you--many--unknown',
i18n,
[count.toString()]
{ count: count.toString() }
);
}
if (inviter) {
@ -715,9 +717,9 @@ export function renderChangeDetail<T>(
);
}
if (fromYou) {
return renderString('GroupV2--pending-remove--revoke--many--you', i18n, [
count.toString(),
]);
return renderString('GroupV2--pending-remove--revoke--many--you', i18n, {
count: count.toString(),
});
}
if (from) {
return renderString(
@ -732,7 +734,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--pending-remove--revoke--many--unknown',
i18n,
[count.toString()]
{ count: count.toString() }
);
}
if (detail.type === 'admin-approval-add-one') {
@ -742,9 +744,9 @@ export function renderChangeDetail<T>(
if (weAreJoiner) {
return renderString('GroupV2--admin-approval-add-one--you', i18n);
}
return renderString('GroupV2--admin-approval-add-one--other', i18n, [
renderContact(uuid),
]);
return renderString('GroupV2--admin-approval-add-one--other', i18n, {
joinerName: renderContact(uuid),
});
}
if (detail.type === 'admin-approval-remove-one') {
const { uuid } = detail;
@ -767,14 +769,14 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--admin-approval-remove-one--other--you',
i18n,
[renderContact(uuid)]
{ joinerName: renderContact(uuid) }
);
}
if (from && from === uuid) {
return renderString(
'GroupV2--admin-approval-remove-one--other--own',
i18n,
[renderContact(uuid)]
{ joinerName: renderContact(uuid) }
);
}
if (from) {
@ -793,7 +795,7 @@ export function renderChangeDetail<T>(
return renderString(
'GroupV2--admin-approval-remove-one--other--own',
i18n,
[renderContact(uuid)]
{ joinerName: renderContact(uuid) }
);
}
if (detail.type === 'admin-approval-bounce') {
@ -836,9 +838,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--group-link-add--enabled--you', i18n);
}
if (from) {
return renderString('GroupV2--group-link-add--enabled--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--group-link-add--enabled--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--group-link-add--enabled--unknown', i18n);
}
@ -847,9 +849,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--group-link-add--disabled--you', i18n);
}
if (from) {
return renderString('GroupV2--group-link-add--disabled--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--group-link-add--disabled--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--group-link-add--disabled--unknown', i18n);
}
@ -861,9 +863,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--group-link-reset--you', i18n);
}
if (from) {
return renderString('GroupV2--group-link-reset--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--group-link-reset--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--group-link-reset--unknown', i18n);
}
@ -872,9 +874,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--group-link-remove--you', i18n);
}
if (from) {
return renderString('GroupV2--group-link-remove--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--group-link-remove--other', i18n, {
adminName: renderContact(from),
});
}
return renderString('GroupV2--group-link-remove--unknown', i18n);
}
@ -884,9 +886,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--description--remove--you', i18n);
}
if (from) {
return renderString('GroupV2--description--remove--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--description--remove--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--description--remove--unknown', i18n);
}
@ -895,9 +897,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--description--change--you', i18n);
}
if (from) {
return renderString('GroupV2--description--change--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--description--change--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--description--change--unknown', i18n);
}
@ -907,9 +909,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--announcements--admin--you', i18n);
}
if (from) {
return renderString('GroupV2--announcements--admin--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--announcements--admin--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--announcements--admin--unknown', i18n);
}
@ -918,9 +920,9 @@ export function renderChangeDetail<T>(
return renderString('GroupV2--announcements--member--you', i18n);
}
if (from) {
return renderString('GroupV2--announcements--member--other', i18n, [
renderContact(from),
]);
return renderString('GroupV2--announcements--member--other', i18n, {
memberName: renderContact(from),
});
}
return renderString('GroupV2--announcements--member--unknown', i18n);
}

44
ts/models/messages.ts
View file

@ -579,7 +579,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
renderString: (
key: string,
_i18n: unknown,
components: Array<string> | ReplacementValuesType<string> | undefined
components: ReplacementValuesType<string> | undefined
) => window.i18n(key, components),
});
@ -640,9 +640,9 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
if (groupUpdate.left) {
return {
text: window.i18n('leftTheGroup', [
this.getNameForNumber(groupUpdate.left),
]),
text: window.i18n('leftTheGroup', {
name: this.getNameForNumber(groupUpdate.left),
}),
};
}
@ -653,7 +653,11 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
if (isMe(fromContact.attributes)) {
messages.push(window.i18n('youUpdatedTheGroup'));
} else {
messages.push(window.i18n('updatedTheGroup', [fromContact.getTitle()]));
messages.push(
window.i18n('updatedTheGroup', {
name: fromContact.getTitle(),
})
);
}
if (groupUpdate.joined && groupUpdate.joined.length) {
@ -666,9 +670,11 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
if (joinedContacts.length > 1) {
messages.push(
window.i18n('multipleJoinedTheGroup', [
joinedWithoutMe.map(contact => contact.getTitle()).join(', '),
])
window.i18n('multipleJoinedTheGroup', {
names: joinedWithoutMe
.map(contact => contact.getTitle())
.join(', '),
})
);
if (joinedWithoutMe.length < joinedContacts.length) {
@ -683,14 +689,20 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
messages.push(window.i18n('youJoinedTheGroup'));
} else {
messages.push(
window.i18n('joinedTheGroup', [joinedContacts[0].getTitle()])
window.i18n('joinedTheGroup', {
name: joinedContacts[0].getTitle(),
})
);
}
}
}
if (groupUpdate.name) {
messages.push(window.i18n('titleIsNow', [groupUpdate.name]));
messages.push(
window.i18n('titleIsNow', {
name: groupUpdate.name,
})
);
}
if (groupUpdate.avatarUpdated) {
messages.push(window.i18n('updatedGroupAvatar'));
@ -788,9 +800,9 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
}
return {
text: window.i18n('timerSetTo', [
expirationTimer.format(window.i18n, expireTimer),
]),
text: window.i18n('timerSetTo', {
time: expirationTimer.format(window.i18n, expireTimer),
}),
};
}
@ -798,9 +810,9 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
const identifier = this.get('key_changed');
const conversation = window.ConversationController.get(identifier);
return {
text: window.i18n('safetyNumberChangedGroup', [
conversation ? conversation.getTitle() : '',
]),
text: window.i18n('safetyNumberChangedGroup', {
name: conversation ? conversation.getTitle() : '',
}),
};
}
const contacts = this.get('contact');

6
ts/services/calling.ts
View file

@ -2266,9 +2266,9 @@ export class CallingClass {
notificationTitle =
conversation?.getTitle() || FALLBACK_NOTIFICATION_TITLE;
notificationMessage = creatorConversation
? window.i18n('calling__call-notification__started', [
creatorConversation.getTitle(),
])
? window.i18n('calling__call-notification__started', {
name: creatorConversation.getTitle(),
})
: window.i18n('calling__call-notification__started-by-someone');
break;
}

4
ts/test-both/types/setupI18n_test.ts
View file

@ -22,7 +22,9 @@ describe('setupI18n', () => {
assert.strictEqual(i18n('reportIssue'), 'Contact Support');
});
it('returns message with single substitution', () => {
const actual = i18n('migratingToSQLCipher', ['45/200']);
const actual = i18n('migratingToSQLCipher', {
status: '45/200',
});
assert.equal(actual, 'Optimizing messages... 45/200 complete.');
});
it('returns message with multiple substitutions', () => {

8
ts/types/Util.ts
View file

@ -40,11 +40,9 @@ export type RenderTextCallbackType = (options: {
key: number;
}) => JSX.Element | string;
export type ReplacementValuesType =
| Array<string>
| {
[key: string]: string | number | undefined;
};
export type ReplacementValuesType = {
[key: string]: string | number | undefined;
};
export type LocalizerType = {
(key: string, values?: ReplacementValuesType): string;

6
ts/util/callingNotification.ts
View file

@ -86,9 +86,9 @@ function getGroupCallNotificationText(
if (notification.creator.isMe) {
return i18n('calling__call-notification__started-by-you');
}
return i18n('calling__call-notification__started', [
notification.creator.systemGivenName ?? notification.creator.title,
]);
return i18n('calling__call-notification__started', {
name: notification.creator.systemGivenName ?? notification.creator.title,
});
}
export function getCallingNotificationText(

4
ts/util/getMutedUntilText.ts
View file

@ -23,5 +23,7 @@ export function getMutedUntilText(
? expires.format('LT')
: expires.format('L, LT');
return i18n('muteExpirationLabel', [muteExpirationUntil]);
return i18n('muteExpirationLabel', {
duration: muteExpirationUntil,
});
}

20
ts/util/timestamp.ts
View file

@ -125,21 +125,21 @@ export function formatDateTimeLong(
const timestamp = rawTimestamp.valueOf();
if (isToday(rawTimestamp)) {
return i18n('timestampFormat__long--today', [
new Intl.DateTimeFormat(locale, {
return i18n('timestampFormat__long--today', {
time: new Intl.DateTimeFormat(locale, {
hour: 'numeric',
minute: 'numeric',
}).format(timestamp),
]);
});
}
if (isYesterday(rawTimestamp)) {
return i18n('timestampFormat__long--yesterday', [
new Intl.DateTimeFormat(locale, {
return i18n('timestampFormat__long--yesterday', {
time: new Intl.DateTimeFormat(locale, {
hour: 'numeric',
minute: 'numeric',
}).format(timestamp),
]);
});
}
return new Intl.DateTimeFormat(locale, {
@ -165,11 +165,15 @@ export function formatTime(
}
if (diff < HOUR) {
return i18n('minutesAgo', [Math.floor(diff / MINUTE).toString()]);
return i18n('minutesAgo', {
minutes: Math.floor(diff / MINUTE).toString(),
});
}
if (isRelativeTime) {
return i18n('hoursAgo', [Math.floor(diff / HOUR).toString()]);
return i18n('hoursAgo', {
hours: Math.floor(diff / HOUR).toString(),
});
}
return new Date(timestamp).toLocaleTimeString([], {