diff --git a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx index 22f7bace7f05..2737a6fc4d4a 100644 --- a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx +++ b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.tsx @@ -65,12 +65,7 @@ const ConnectionStatusBar: FC = function ConnectionStatusBar() { {t('meteor_status' as Parameters[0], { context: status })} - {status === 'waiting' && ( - <> - {' '} - {t(reconnectCountdown === 1 ? 'meteor_status_reconnect_in' : 'meteor_status_reconnect_in_plural', { count: reconnectCountdown })} - - )} + {status === 'waiting' && <> {t('meteor_status_reconnect_in', { count: reconnectCountdown })}} {['waiting', 'offline'].includes(status) && ( <> diff --git a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx index 02c1b49f5908..5589d1278905 100644 --- a/apps/meteor/client/components/message/content/DiscussionMetrics.tsx +++ b/apps/meteor/client/components/message/content/DiscussionMetrics.tsx @@ -23,7 +23,7 @@ const DiscussionMetrics = ({ lm, count, rid, drid }: DiscussionMetricsProps): Re goToRoom(drid)}> - {count ? t(count === 1 ? 'message_counter' : 'message_counter_plural', { counter: count }) : t('Reply')} + {count ? t('message_counter', { counter: count, count }) : t('Reply')} diff --git a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx index a228f9522247..da135cbdedfc 100644 --- a/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx +++ b/apps/meteor/client/views/marketplace/components/EnabledAppsCount.tsx @@ -19,10 +19,8 @@ const EnabledAppsCount = ({ }): ReactElement | null => { const t = useTranslation(); - const privateAppsCountText: string = - enabled === 1 ? t('Private_Apps_Count_Enabled', { count: enabled }) : t('Private_Apps_Count_Enabled_plural', { count: enabled }); - const marketplaceAppsCountText: string = - enabled === 1 ? t('Apps_Count_Enabled', { count: enabled }) : t('Apps_Count_Enabled_plural', { count: enabled }); + const privateAppsCountText: string = t('Private_Apps_Count_Enabled', { count: enabled }); + const marketplaceAppsCountText: string = t('Apps_Count_Enabled', { count: enabled }); return ( { throw new Error(t('No_messages_found_to_prune')); } - dispatchToastMessage({ - type: 'success', - message: t(count === 1 ? '__count__message_pruned' : '__count__message_pruned_plural', { count }), - }); + dispatchToastMessage({ type: 'success', message: t('__count__message_pruned', { count }) }); methods.reset(); } catch (error: unknown) { dispatchToastMessage({ type: 'error', message: error }); diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx index 55960d1a532e..e63e47c402e6 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx @@ -94,12 +94,7 @@ const VideoConfListItem = ({ {joinedUsers.length > VIDEOCONF_STACK_MAX_USERS - ? t( - joinedUsers.length - VIDEOCONF_STACK_MAX_USERS === 1 - ? '__usersCount__member_joined' - : '__usersCount__member_joined_plural', - { usersCount: joinedUsers.length - VIDEOCONF_STACK_MAX_USERS }, - ) + ? t('__usersCount__member_joined', { usersCount: joinedUsers.length - VIDEOCONF_STACK_MAX_USERS }) : t('joined')}