Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Fix grammatical typo when only one message is pruned #21902

Merged
merged 8 commits into from
Aug 23, 2022
Merged

Chore: Fix grammatical typo when only one message is pruned #21902

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5e1393b
Fix grammatical typo when only 1 message is pruned
shrinish123 Apr 30, 2021
652e129
Merge branch 'develop' into patch-10
ggazzo May 12, 2021
590b47a
Fix PR as per new changes
shrinish123 May 15, 2021
d48c7af
Merge branch 'develop' into patch-10
dougfabris Jul 29, 2022
af63b77
fix: error message
dougfabris Jul 29, 2022
d2dc536
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into patc…
tassoevan Aug 23, 2022
93c55c5
Change translation key
tassoevan Aug 23, 2022
a914480
Revert "Change translation key"
tassoevan Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ const PruneMessagesWithData = ({ rid, tabBar }: { rid: IRoom['_id']; tabBar: Too
throw new Error(t('No_messages_found_to_prune'));
}

dispatchToastMessage({ type: 'success', message: `${count} ${t('messages_pruned')}` });
dispatchToastMessage({ type: 'success', message: t('__count__message_pruned', { count }) });
closeModal();
reset();
} catch (error) {
dispatchToastMessage({ type: 'error', message: error instanceof Error ? error : String(error) });
dispatchToastMessage({ type: 'error', message: error });
closeModal();
}
};
Expand Down
3 changes: 2 additions & 1 deletion apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
"500": "Internal Server Error",
"__count__empty_rooms_will_be_removed_automatically": "__count__ empty rooms will be removed automatically.",
"__count__empty_rooms_will_be_removed_automatically__rooms__": "__count__ empty rooms will be removed automatically:<br/> __rooms__.",
"__count__message_pruned": "__count__ message pruned",
"__count__message_pruned_plural": "__count__ messages pruned",
"__usersCount__members_joined": "+ __usersCount__ members joined",
"__usersCount__people_will_be_invited": "__usersCount__ people will be invited",
"__username__is_no_longer__role__defined_by__user_by_": "__username__ is no longer __role__ by __user_by__",
Expand Down Expand Up @@ -3165,7 +3167,6 @@
"MessageBox_view_mode": "MessageBox View Mode",
"messages": "messages",
"Messages": "Messages",
"messages_pruned": "messages pruned",
"Messages_selected": "Messages selected",
"Messages_sent": "Messages sent",
"Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Messages that are sent to the Incoming WebHook will be posted here.",
Expand Down