Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-04-27 11:53:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fully migrate to ICU

Browse Source
This commit is contained in:
Jamie Kyle
2023-03-29 17:03:25 -07:00
committed by GitHub
parent d4e7177ba6
commit 5e647c55d1
274 changed files with 7948 additions and 1944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ts/components/conversation/conversation-details/AddGroupMembersModal/ChooseGroupMembersModal.tsx
View File

@@ -211,7 +211,7 @@ export function ChooseGroupMembersModal({
return {
type: RowType.Header,
// eslint-disable-next-line @typescript-eslint/no-shadow
getHeaderText: i18n => i18n('contactsHeader'),
getHeaderText: i18n => i18n('icu:contactsHeader'),
};
}
@@ -250,7 +250,7 @@ export function ChooseGroupMembersModal({
return {
type: RowType.Header,
// eslint-disable-next-line @typescript-eslint/no-shadow
getHeaderText: i18n => i18n('findByPhoneNumberHeader'),
getHeaderText: i18n => i18n('icu:findByPhoneNumberHeader'),
};
}
if (virtualIndex === 1) {
@@ -269,7 +269,7 @@ export function ChooseGroupMembersModal({
return {
type: RowType.Header,
// eslint-disable-next-line @typescript-eslint/no-shadow
getHeaderText: i18n => i18n('findByUsernameHeader'),
getHeaderText: i18n => i18n('icu:findByUsernameHeader'),
};
}
if (virtualIndex === 1) {
@@ -383,7 +383,7 @@ export function ChooseGroupMembersModal({
>
<div className="module-AddGroupMembersModal module-AddGroupMembersModal--choose-members">
<button
aria-label={i18n('close')}
aria-label={i18n('icu:close')}
className="module-AddGroupMembersModal__close-button"
type="button"
onClick={() => {
@@ -391,11 +391,11 @@ export function ChooseGroupMembersModal({
}}
/>
<h1 className="module-AddGroupMembersModal__header">
{i18n('AddGroupMembersModal--title')}
{i18n('icu:AddGroupMembersModal--title')}
</h1>
<SearchInput
i18n={i18n}
placeholder={i18n('contactSearchPlaceholder')}
placeholder={i18n('icu:contactSearchPlaceholder')}
onChange={event => {
setSearchTerm(event.target.value);
}}
@@ -483,16 +483,16 @@ export function ChooseGroupMembersModal({
</Measure>
) : (
<div className="module-AddGroupMembersModal__no-candidate-contacts">
{i18n('noContactsFound')}
{i18n('icu:noContactsFound')}
</div>
)}
<div className="module-AddGroupMembersModal__button-container">
<Button onClick={onClose} variant={ButtonVariant.Secondary}>
{i18n('cancel')}
{i18n('icu:cancel')}
</Button>
<Button disabled={!canContinue} onClick={confirmAdds}>
{i18n('AddGroupMembersModal--continue-to-confirm')}
{i18n('icu:AddGroupMembersModal--continue-to-confirm')}
</Button>
</div>
</div>

12
ts/components/conversation/conversation-details/AddGroupMembersModal/ConfirmAdditionsModal.tsx
View File

@@ -47,7 +47,7 @@ export function ConfirmAdditionsModal({
headerText = (
<Intl
i18n={i18n}
id="AddGroupMembersModal--confirm-title--one"
id="icu:AddGroupMembersModal--confirm-title--one"
components={{
person: <ContactName title={firstContact.title} />,
group: groupTitleNode,
@@ -58,7 +58,7 @@ export function ConfirmAdditionsModal({
headerText = (
<Intl
i18n={i18n}
id="AddGroupMembersModal--confirm-title--many"
id="icu:AddGroupMembersModal--confirm-title--many"
components={{
count: selectedContacts.length.toString(),
group: groupTitleNode,
@@ -73,9 +73,9 @@ export function ConfirmAdditionsModal({
<Spinner size="20px" svgSize="small" direction="on-avatar" />
);
} else if (selectedContacts.length === 1) {
buttonContents = i18n('AddGroupMembersModal--confirm-button--one');
buttonContents = i18n('icu:AddGroupMembersModal--confirm-button--one');
} else {
buttonContents = i18n('AddGroupMembersModal--confirm-button--many');
buttonContents = i18n('icu:AddGroupMembersModal--confirm-button--many');
}
return (
@@ -87,12 +87,12 @@ export function ConfirmAdditionsModal({
<h1 className="module-AddGroupMembersModal__header">{headerText}</h1>
{requestState === RequestState.InactiveWithError && (
<div className="module-AddGroupMembersModal__error-message">
{i18n('updateGroupAttributes__error-message')}
{i18n('icu:updateGroupAttributes__error-message')}
</div>
)}
<div className="module-AddGroupMembersModal__button-container">
<Button onClick={onClose} variant={ButtonVariant.Secondary}>
{i18n('cancel')}
{i18n('icu:cancel')}
</Button>
<Button