Skip to content

Commit

Permalink
Fix grouped reaction notification text
Browse files Browse the repository at this point in the history
  • Loading branch information
TheEssem committed Oct 1, 2024
1 parent f8a3873 commit 55cd0e3
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,27 @@ import type { NotificationGroupReaction } from 'flavours/glitch/models/notificat
import type { LabelRenderer } from './notification_group_with_status';
import { NotificationGroupWithStatus } from './notification_group_with_status';

const labelRenderer: LabelRenderer = (values) => (
<FormattedMessage
id='notification.reaction'
defaultMessage='{name} reacted to your status'
values={values}
/>
);
const labelRenderer: LabelRenderer = (displayedName, total) => {
if (total === 1)
return (
<FormattedMessage
id='notification.reaction'
defaultMessage='{name} reacted to your status'
values={{ name: displayedName }}
/>
);

return (
<FormattedMessage
id='notification.reaction.name_and_others'
defaultMessage='{name} and {count, plural, one {# other} other {# others}} reacted to your post'
values={{
name: displayedName,
count: total - 1,
}}
/>
);
};

export const NotificationReaction: React.FC<{
notification: NotificationGroupReaction;
Expand Down
1 change: 1 addition & 0 deletions app/javascript/flavours/glitch/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"navigation_bar.misc": "Misc",
"notification.markForDeletion": "Mark for deletion",
"notification.reaction": "{name} reacted to your post",
"notification.reaction.name_and_others": "{name} and {count, plural, one {# other} other {# others}} reacted to your post",
"notification_purge.btn_all": "Select\nall",
"notification_purge.btn_apply": "Clear\nselected",
"notification_purge.btn_invert": "Invert\nselection",
Expand Down

0 comments on commit 55cd0e3

Please sign in to comment.