Merge remote-tracking branch 'origin/develop' into next

This commit is contained in:
Alex Gleason 2022-04-10 14:46:51 -05:00
commit c8220be1b4
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7

View file

@ -82,7 +82,7 @@ class BirthdayReminders extends ImmutablePureComponent {
); );
if (birthdays.size === 1) { if (birthdays.size === 1) {
return <FormattedMessage id='notification.birthday' defaultMessage='{name} has birthday today' values={{ name: link }} />; return <FormattedMessage id='notification.birthday' defaultMessage='{name} has a birthday today' values={{ name: link }} />;
} }
return ( return (
@ -109,7 +109,7 @@ class BirthdayReminders extends ImmutablePureComponent {
const { intl, birthdays, account } = this.props; const { intl, birthdays, account } = this.props;
if (birthdays.size === 1) { if (birthdays.size === 1) {
return intl.formatMessage({ id: 'notification.birthday', defaultMessage: '{name} has birthday today' }, { name: account.get('display_name') }); return intl.formatMessage({ id: 'notification.birthday', defaultMessage: '{name} has a birthday today' }, { name: account.get('display_name') });
} }
return intl.formatMessage( return intl.formatMessage(