Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fixed #30439 - Added support for different plurals for the same language. #12332

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
Merged
merged 1 commit into from
Mar 10, 2020
Merged

Fixed #30439 - Added support for different plurals for the same language. #12332

merged 1 commit into from
Mar 10, 2020

Conversation

@claudep
Copy link
Member

@claudep claudep commented Jan 16, 2020 •
edited by carltongibson
Loading

@claudep
Copy link
Member Author

claudep commented Jan 18, 2020

@uri-rodberg Any chance to test this code?

@uri-rodberg
Copy link
Contributor

uri-rodberg commented Jan 18, 2020

@uri-rodberg Any chance to test this code?

@claudep It seems that this PR fixes what is not working for Speedy Net in Django 2.2:

Speedy Net with Django==2.2.9
Speedy Net with Django==2.2.9 + This PR included

I still have to check more, but it seems that everything in Speedy Net works with this PR.

If this PR is accepted, will it be possible to apply it to Django 2.2 as well?

carltongibson
carltongibson reviewed Jan 22, 2020
View reviewed changes
carltongibson
carltongibson reviewed Jan 22, 2020
View reviewed changes
Copy link
Member

@carltongibson carltongibson left a comment

Choose a reason for hiding this comment

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

Hi Claude.

This looks good to me. I follow the discussion on the ticket so far, and then I have to admit to getting lost at the end. As I understood it though this seems to be the kernel of what's at stake.

Do you want me to harass for more testing? Or are we happy with Uri's feedback?

Do we need an update here: https://docs.djangoproject.com/en/2.2/topics/i18n/translation/#pluralization β€” in particular the last Note was mentioned on the ticket.

Thanks for your work!

@claudep
Copy link
Member Author

claudep commented Jan 22, 2020

Thanks for reviewing! As for more testing, I would much appreciate a review by @nijel, the initial reporter and an i18n expert.
And of course, the note about "Plural form and po files" definitely needs to be updated too! A release note would also be needed.

@carltongibson carltongibson mentioned this pull request Jan 22, 2020
Closed
m-aciek
m-aciek suggested changes Jan 22, 2020
View reviewed changes
Copy link

@m-aciek m-aciek left a comment

Choose a reason for hiding this comment

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

I am adding comments about two fragments, one of them may be a bug.

@nijel
Copy link
Contributor

nijel commented Feb 2, 2020

I've finally got to testing this and I can confirm it works fine for Weblate. Looking at the code it also looks good. Thanks!

Has this chance to land in 2.2?

@uri-rodberg
Copy link
Contributor

uri-rodberg commented Feb 2, 2020

@uri-rodberg Any chance to test this code?

@claudep Do we need to test Speedy Net again? I see you changed this PR after my test.

@claudep
Copy link
Member Author

claudep commented Feb 2, 2020

@claudep Do we need to test Speedy Net again? I see you changed this PR after my test.

No, it was a minor thing, no need to re-test.

Has this chance to land in 2.2?

I'm afraid not.

@nijel nijel mentioned this pull request Feb 3, 2020
Closed
9 tasks
@uri-rodberg
Copy link
Contributor

uri-rodberg commented Feb 10, 2020

Any update for this PR? @carltongibson

@uri-rodberg uri-rodberg mentioned this pull request Feb 15, 2020
Closed
@nijel nijel mentioned this pull request Mar 3, 2020
Closed
@carltongibson carltongibson self-requested a review March 10, 2020 08:33
carltongibson
carltongibson approved these changes Mar 10, 2020
View reviewed changes
Copy link
Member

@carltongibson carltongibson left a comment •
edited
Loading

Choose a reason for hiding this comment

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

OK, let's get this in. πŸ‘

Rebased and adjusted the release notes for backport to 3.0 and 2.2.

Thanks for the work all!

felixxm
felixxm reviewed Mar 10, 2020
View reviewed changes
felixxm
felixxm reviewed Mar 10, 2020
View reviewed changes
@carltongibson carltongibson force-pushed the 30439 branch 3 times, most recently from 4f99236 to e5b7b93 Compare March 10, 2020 12:03
felixxm
felixxm reviewed Mar 10, 2020
View reviewed changes
@claudep @carltongibson
Fixed #30439 - Added support for different plurals for the same langu…
6b840e5 
…age.

Thanks to Michal ČihaΕ™ for review.
@carltongibson carltongibson merged commit e3e48b0 into django:master Mar 10, 2020
@claudep claudep deleted the 30439 branch March 10, 2020 16:11
@uri-rodberg
Copy link
Contributor

uri-rodberg commented Mar 11, 2020

Thank you for accepting this PR and applying it to Django 2.2 and 3.0 too.

@uri-rodberg uri-rodberg mentioned this pull request Mar 16, 2020
Closed
nijel added a commit to WeblateOrg/weblate that referenced this pull request Apr 1, 2020
@nijel
Utils: Remove hack to adjust Django locales behavior
bb90a29 
It now works correctly since
django/django#12332.

Fixes #3552
@uri-rodberg
Copy link
Contributor

uri-rodberg commented Apr 12, 2020

Hi, I just want to say that I upgraded Django to 2.2.12 in Speedy Net and then upgraded again to 3.0.5, and everything works as expected. I didn't change anything in our translation files and they are still using the old plural forms formula like before ("Plural-Forms: nplurals=2; plural=(n != 1);\n").

@claudep
Copy link
Member Author

claudep commented Apr 12, 2020

Thanks for the feedback!

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

Reviewers

@carltongibson carltongibson carltongibson approved these changes

@felixxm felixxm felixxm left review comments

+1 more reviewer

@m-aciek m-aciek m-aciek requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@claudep @uri-rodberg @nijel @carltongibson @felixxm @m-aciek