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

GroupNotification: Use singular string when we have just one contact

Browse source
This commit is contained in:
Scott Nonnenberg 2020-06-11 10:32:21 -07:00 committed by GitHub
parent 419f219f91
commit 205ee6c6ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@ import React from 'react';
import { compact, flatten } from 'lodash';
import { ContactName } from './ContactName';
import { FullJSXType, Intl } from '../Intl';
import { Intl } from '../Intl';
import { LocalizerType } from '../../types/Util';
import { missingCaseError } from '../../util/missingCaseError';
@ -36,7 +36,7 @@ export class GroupNotification extends React.Component<Props> {
const { contacts, type, newName } = change;
const { i18n } = this.props;
const otherPeople = compact(
const otherPeople: Array<JSX.Element> = compact(
(contacts || []).map(contact => {
if (contact.isMe) {
return null;
@ -56,7 +56,7 @@ export class GroupNotification extends React.Component<Props> {
);
})
);
const otherPeopleWithCommas: FullJSXType = compact(
const otherPeopleWithCommas: Array<JSX.Element | string> = compact(
flatten(
otherPeople.map((person, index) => [index > 0 ? ', ' : null, person])
)
@ -89,11 +89,14 @@ export class GroupNotification extends React.Component<Props> {
}
}
const joinedKey =
contacts.length > 1 ? 'multipleJoinedTheGroup' : 'joinedTheGroup';
return (
<>
<Intl
i18n={i18n}
id="multipleJoinedTheGroup"
id={joinedKey}
components={[otherPeopleWithCommas]}
/>
{contactsIncludesMe ? (