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.

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

#12451 Issue: Replace string with plurals #13616

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

Aayush-Goel-04
Copy link
Contributor

@Aayush-Goel-04 Aayush-Goel-04 commented Apr 16, 2023

Checklist

  • You have a descriptive commit message with a short title (first line, max 50 chars).
  • You have commented your code, particularly in hard-to-understand areas
  • You have performed a self-review of your own code
  • UI changes: include screenshots of all affected screens (in particular showing any new or changed strings)
  • UI Changes: You have tested your change using the Google Accessibility Scanner

Fixes #12451

@welcome
Copy link

welcome bot commented Apr 16, 2023

First PR! 🚀 We sincerely appreciate that you have taken the time to propose a change to AnkiDroid! Please have patience with us as we are all volunteers - we will get to this as soon as possible.

@github-actions
Copy link
Contributor

Message to maintainers, this PR contains strings changes.

  1. Before merging this PR, it is best to run the "Sync Translations" GitHub action, then make and merge a PR from the i18n_sync branch to get translations cleaned out.
  2. Then merge this PR, and immediately do another translation PR so the huge change made by this PR's key changes are all by themselves.

Read more about updating strings on the wiki,

@david-allison
Copy link
Member

Thanks for the PR!! 🙏

Please change the string keys if you're changing values

The CI is failing, could you look into this?

Copy link
Member

@david-allison david-allison left a comment

Choose a reason for hiding this comment

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

CI needs fixing

@Aayush-Goel-04
Copy link
Contributor Author

Aayush-Goel-04 commented Apr 17, 2023

Of the 8 PluralCandidates, first and last one don't need to be changed to plurals.
For first one , both the params are constants. So String will be always be same.
For last one, It is used to create "notify" dialog in notification preferences where strings always in plural form.The string entry values are always more than 1.
For remaining, we need to add plurals.
Plurals 2,3,4,5,6,7 have been changed. String key names have been changed as-
name = "string_key" to name ="string_key_new"

@Aayush-Goel-04
Copy link
Contributor Author

CI needs fixing

@david-allison
I have changed the string keys.
All checks are now passing.
Can you review it?

@Aayush-Goel-04
Copy link
Contributor Author

Hi @david-allison
Can you review the changes made.
Thanks!

String key pairs have been changed by adding '_new" to the key. Ex.  name = "string_key" to name = "string_key_new"

Final Updates for Plural Candidates
Copy link
Member

@mikehardy mikehardy left a comment

Choose a reason for hiding this comment

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

These look good to me. I removed the merge commit, rebased to current main and re-pushed, plus committed one small text change, if CI passes I think this can go in

@mikehardy mikehardy added Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) squash-merge The pull request currently requires maintainers to "Squash Merge" labels Jun 22, 2023
@mikehardy mikehardy merged commit 99dc92e into ankidroid:main Jun 22, 2023
9 checks passed
@github-actions github-actions bot added this to the 2.16 release milestone Jun 22, 2023
@github-actions github-actions bot removed Pending Merge Things with approval that are waiting future merge (e.g. targets a future release, CI wait, etc) squash-merge The pull request currently requires maintainers to "Squash Merge" labels Jun 22, 2023
@Aayush-Goel-04 Aayush-Goel-04 deleted the Aayush-Goel-04/issue12451 branch June 22, 2023 21:40
dae pushed a commit to ankitects/Anki-Android that referenced this pull request Jun 29, 2023
* Fix: ankidroid#12451 Issue: Replace string with plurals

String key pairs have been changed by adding '_new" to the key. Ex.  name = "string_key" to name = "string_key_new"

Final Updates for Plural Candidates

* disambiguate apostrophe with expansion of text

---------

Co-authored-by: Mike Hardy <[email protected]>
@github-actions
Copy link
Contributor

Hi there @Aayush-Goel-04! This is the OpenCollective Notice for PRs merged from 2023-06-01 through 2023-06-30

If you are interested in compensation for this work, the process with details is here:

https://github.com/ankidroid/Anki-Android/wiki/OpenCollective-Payment-Process#how-to-get-paid

We only post one comment per person per month to avoid spamming you, regardless of the number of PRs merged, but this note applies to all PRs merged for this month

Please note that GSoC contributions are okay for this process. Our philosophy is that our users have donated to AnkiDroid for all contributions. The only PRs that will not go through the OpenCollective process are ones directly related to am accepted GSoC project from a selected participant, since those receive a stipend from GSoC itself.

Please understand that our monthly budget is never guaranteed to cover all claims - the cap on payments-per-person may be lower, but we try to make our process as fair and transparent as possible, we just need your understanding.

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

May be plurals added to following strings
4 participants