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

Jump to bottom

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

merged 8 commits into from
Aug 23, 2022

Conversation

shrinish123
Copy link
Contributor

@shrinish123 shrinish123 commented Apr 30, 2021 •
edited by dougfabris
Loading

Proposed changes (including videos or screenshots)

Whenever only 1 message is pruned it says '1 messages pruned' instead of '1 message pruned' in the toast message

Issue(s)

Closes #24940

Steps to test or reproduce

Try to prune only 1 message check the toast message

Further comments

This is done to implement the requested changes on #21341

@shrinish123
Copy link
Contributor Author

@KevLehman Please review 😄. I made another pull request to implement the requested changes as the repo linked with that pull request was deleted.

@shrinish123 shrinish123 mentioned this pull request Apr 30, 2021
Closed
@sumukhah
Copy link
Contributor

sumukhah commented May 1, 2021

Hey @shrinish123,
You can pull the same branch to your local repo (If that is what you were looking for).

@shrinish123
Copy link
Contributor Author

Hey @shrinish123,
You can pull the same branch to your local repo (If that is what you were looking for).

No the online forked repo was deleted

KevLehman
KevLehman previously approved these changes May 3, 2021
View reviewed changes
@shrinish123
Copy link
Contributor Author

@sampaiodiego Please Review 😄

@shrinish123
Copy link
Contributor Author

@ggazzo Please check this PR

@shrinish123
Copy link
Contributor Author

@ggazzo I have made changes as per the current code. Please check.

ggazzo
ggazzo requested changes Aug 13, 2021
View reviewed changes
Copy link
Member

@ggazzo ggazzo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hey @shrinish123 can I ask you to solve this issue in a "proper" way?
3 points:

1- we don't have message_pruned key for english or any "default" language

2- help us stop concatenating strings: (look at the count part)
create the key: "message_pruned": "__count__ message pruned"

3- tap-i18n has "plural" feature, so change the "messages_pruned": "messages pruned" to "message_pruned_plural": "__count__ messages pruned"

and use

t("message_pruned", { count })

no need to use if/else

@CLAassistant
Copy link

CLAassistant commented Dec 17, 2021 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@dougfabris dougfabris added this to the 5.1.0 milestone Jul 29, 2022
@shrinish123 shrinish123 requested a review from a team as a code owner July 29, 2022 19:36
@dougfabris dougfabris requested a review from ggazzo July 29, 2022 19:48
@dougfabris dougfabris changed the title [FIX] Fix grammatical typo when only 1 message is pruned Chore: Fix grammatical typo when only 1 message is pruned Jul 29, 2022
dougfabris
dougfabris previously approved these changes Jul 29, 2022
View reviewed changes
@casalsgh casalsgh changed the title Chore: Fix grammatical typo when only 1 message is pruned Chore: Fix grammatical typo when only one message is pruned Aug 23, 2022
@tassoevan tassoevan added the stat: ready to merge PR tested and approved waiting for merge label Aug 23, 2022
@ggazzo ggazzo merged commit 655a6fd into RocketChat:develop Aug 23, 2022
gabriellsh added a commit that referenced this pull request Aug 24, 2022
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into impr…
5c923af 
…ove/otr-message

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Regression: Add alsoSendThreadToChannel to user settings api (#26663)
  [IMPROVE] Spotlight search user results (#26599)
  [FIX] Slack User CSV importer not working (#26629)
  Chore: Importer rest types, meteor methods to TS and API unit tests (#26284)
  [NEW] Adding oauth crud on the rocket.chat side (#26220)
  [NEW] allow ephemeral messages to receive a specific id (#26118)
  [FIX] MDM content alignment (#26665)
  Chore: Permissions check per endpoint/method (#26419)
  Regression: CI (#26658)
  [FIX] Not allowed error in discussion room with a private parent channel (#26394)
  Chore: Fix grammatical typo when only one message is pruned (#21902)
  [FIX] Agents (with user status offline & omni-status as available) not able to take or forward chat (#26575)
  i18n: Language update from LingoHub 🤖 on 2022-08-22Z (#26645)
  Chore: Add license env var to ee tests (#26650)
  Chore: Move `Card` and related components to `@rocket.chat/ui-client` (#26653)
  Regression: Custom status loading forever in Usercard (#26656)
  [FIX] Current Chat Custom Field Filter (#26200)
  Chore: Migrate modules related to `room` template to TypeScript (#25881)
  Chore: Create teams management tests (#26578)
csuadev pushed a commit that referenced this pull request Aug 26, 2022
@shrinish123 @ggazzo
@dougfabris @tassoevan
Chore: Fix grammatical typo when only one message is pruned (#21902)
f6d15c5 
Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
Co-authored-by: dougfabris <devfabris@gmail.com>
Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
@murtaza98 murtaza98 mentioned this pull request Sep 2, 2022
Merged
@dougfabris dougfabris mentioned this pull request Jan 5, 2024
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dougfabris dougfabris dougfabris left review comments

@KevLehman KevLehman KevLehman left review comments

@ggazzo ggazzo Awaiting requested review from ggazzo

Assignees
No one assigned
Labels
communityPR stat: QA skipped stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Milestone
5.1.0
Development

Successfully merging this pull request may close these issues.

[BUG] Typo when 1 message is pruned
9 participants
@shrinish123 @sumukhah @CLAassistant @ggazzo @KevLehman @dougfabris @tassoevan @debdutdeb @casalsgh