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

gh-62519: Make pgettext search plurals when translation is not found #107118

Merged
merged 3 commits into from
Jul 23, 2023
Merged

gh-62519: Make pgettext search plurals when translation is not found #107118

merged 3 commits into from
Jul 23, 2023

Conversation

tomasr8
Copy link
Member

@tomasr8 tomasr8 commented Jul 23, 2023 •
edited by bedevere-bot
Loading

Related issue: #62519

Now that gettext is fixed, let's also fix pgettext.

@bedevere-bot bedevere-bot mentioned this pull request Jul 23, 2023
Closed
@ambv ambv merged commit b3c34e5 into python:main Jul 23, 2023
@tomasr8 tomasr8 deleted the pgettext-bugfix branch July 23, 2023 14:08
@ambv ambv added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Jul 23, 2023
@miss-islington
Copy link
Contributor

Thanks @tomasr8 for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Thanks @tomasr8 for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-107133 is a backport of this pull request to the 3.11 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 23, 2023
@tomasr8 @ambv @miss-islington
pythongh-62519: Make pgettext search plurals when translation is not …
85dff8c 
…found (pythonGH-107118)

(cherry picked from commit b3c34e5)

Co-authored-by: Tomas R <tomas.roun8@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jul 23, 2023
@bedevere-bot
Copy link

GH-107134 is a backport of this pull request to the 3.12 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.12 bug and security fixes label Jul 23, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 23, 2023
@tomasr8 @ambv @miss-islington
pythongh-62519: Make pgettext search plurals when translation is not …
d7fdfb5 
…found (pythonGH-107118)

(cherry picked from commit b3c34e5)

Co-authored-by: Tomas R <tomas.roun8@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
jtcave pushed a commit to jtcave/cpython that referenced this pull request Jul 23, 2023
@tomasr8 @ambv @jtcave
pythongh-62519: Make pgettext search plurals when translation is not …
73f1ba3 
…found (python#107118)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
mementum pushed a commit to mementum/cpython that referenced this pull request Jul 23, 2023
@tomasr8 @ambv @mementum
pythongh-62519: Make pgettext search plurals when translation is not …
307e1e2 
…found (python#107118)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
carljm added a commit to carljm/cpython that referenced this pull request Jul 24, 2023
@carljm
Merge branch 'main' into superfix
9a6bdfa 
* main: (73 commits)
  Thoroughly refactor the cases generator (python#107151)
  Docs: Add missing markup to Argument Clinic docs (python#106876)
  pythongh-107162: Document errcode.h usage in its comment (python#107177)
  pythongh-106320: Remove private _PyDict C API (python#107145)
  Fix PyVectorcall_Function doc versionadded (python#107140)
  Docs: Remove duplicate word in Argument Clinic howto heading (python#107169)
  pythongh-107017: Change Chapter Strings to Texts in the Introduction chapter. (python#107104)
  pythongh-106320: Remove private _PyObject C API (python#107159)
  Docs: fix typo in os.pwrite docstring (python#107087)
  pythongh-105291: Add link to migration guide for distutils (python#107130)
  pythongh-106948: Docs: Disable links for C standard library functions, OS utility functions and system calls (python#107062)
  pythongh-106320: Remove _PyBytes_Join() C API (python#107144)
  pythongh-106320: Remove private _PyObject C API (python#107147)
  pythongh-106320: Remove _PyTuple_MaybeUntrack() C API (python#107143)
  pythongh-106320: Remove _PyIsSelectable_fd() C API (python#107142)
  Remove superflous whitespaces in `layout.html`. (pythonGH-107067)
  pythongh-107122: Update what's news for dbm.*dbm.clear() method (pythongh-107135)
  pythongh-107122: Add clear method to dbm.ndbm module (pythongh-107126)
  pythongh-62519: Make pgettext search plurals when translation is not found (python#107118)
  pythongh-107122: Add clear method to dbm.gdbm.module (pythongh-107127)
  ...
serhiy-storchaka pushed a commit that referenced this pull request Jul 25, 2023
@miss-islington @tomasr8 @ambv
[3.12] gh-62519: Make pgettext search plurals when translation is not…
11d86c5 
… found (GH-107118) (GH-107134)

(cherry picked from commit b3c34e5)

Co-authored-by: Tomas R <tomas.roun8@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
serhiy-storchaka pushed a commit that referenced this pull request Jul 25, 2023
@miss-islington @tomasr8 @ambv
[3.11] gh-62519: Make pgettext search plurals when translation is not…
41756e3 
… found (GH-107118) (GH-107133)

(cherry picked from commit b3c34e5)

Co-authored-by: Tomas R <tomas.roun8@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
@tomasr8 tomasr8 mentioned this pull request May 13, 2024
Merged
akx pushed a commit to python-babel/babel that referenced this pull request Jul 11, 2024
@tomasr8
Make pgettext search plurals when translation is not found (#1085)
8de07f3 
pgettext can now find the following translation
when using `pgettext("ctx", "foo")`:
```
msgctxt "ctx"
msgid "foo"
msgid_plural "foos"
msgstr[0] "foo translated"
```

The upstream CPython PR is  python/cpython#107118
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ambv ambv ambv left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@tomasr8 @miss-islington @bedevere-bot @ambv