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

bpo-18319: gettext() can retrieve a message even if a plural form exists #19869

Merged
merged 4 commits into from
Jul 23, 2023

Conversation

gbassiere
Copy link
Contributor

@gbassiere gbassiere commented May 2, 2020

Let's say you have this in your code:

gettext('egg')

and elsewhere this :

ngettext('egg', 'eggs', n)

GNU gettext tools extracts these as the same unique message and sensibly creates a pluralized entry in the PO file.

In the Python gettext module, when the MO file is parsed, a singular 'egg' will be stored as:

catalog['egg']

whereas a pluralized 'egg' is stored as:

catalog[('egg', 0)]
catalog[('eggs', 1)]

As a consequence, gettext('egg') fail to retrieve translations and you have to resort to ngettext('egg', 'eggs', 1) which is odd.

My suggestion is simply to modify gettext() so that is looks for catalog[('egg', 0)] if catalog['egg'] didn't match.

https://bugs.python.org/issue18319

@the-knights-who-say-ni
Copy link

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept this contribution by verifying everyone involved has signed the PSF contributor agreement (CLA).

Recognized GitHub username

We couldn't find a bugs.python.org (b.p.o) account corresponding to the following GitHub usernames:

@gbassiere

This might be simply due to a missing "GitHub Name" entry in one's b.p.o account settings. This is necessary for legal reasons before we can look at this contribution. Please follow the steps outlined in the CPython devguide to rectify this issue.

You can check yourself to see if the CLA has been received.

Thanks again for the contribution, we look forward to reviewing it!

Lib/gettext.py Outdated
return message
try:
# if `message` has plural forms
tmsg = self._catalog[(message, self.plural(1))]
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
tmsg = self._catalog[(message, self.plural(1))]
return self._catalog[(message, self.plural(1))]

Lib/gettext.py Outdated
if self._fallback:
return self._fallback.gettext(message)
return message
try:
Copy link
Contributor

@taleinat taleinat Oct 18, 2020

Choose a reason for hiding this comment

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

I suggest simply adding the following before the existing if tmsg is missing: ... block:

        if tmsg is missing:
            tmsg = self._catalog.get((message, self.plural(1)), missing)

@ThiefMaster
Copy link

Just noticed this annoying bug as well (via babel). It's impossible to work around without starting to mess around with message contexts (and I should NOT need to add garbage to my code (and pot files) because of this), so it would be great if this fix could get merged..

@akulakov
Copy link
Contributor

akulakov commented Aug 6, 2021

Should this logic be also added to pgettext() ?

@ambv ambv merged commit 5463252 into python:main Jul 23, 2023
17 checks passed
@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 @gbassiere 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 @gbassiere for the PR, and @ambv for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@bedevere-bot
Copy link

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

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Jul 23, 2023
@bedevere-bot
Copy link

GH-107108 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
…sts (pythonGH-19869)

(cherry picked from commit 5463252)

Co-authored-by: Gilles Bassière <gbassiere@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 23, 2023
…sts (pythonGH-19869)

(cherry picked from commit 5463252)

Co-authored-by: Gilles Bassière <gbassiere@gmail.com>
ambv pushed a commit that referenced this pull request Jul 23, 2023
…orm exists (GH-19869) (#107108)

(cherry picked from commit 5463252)

Co-authored-by: Gilles Bassière <gbassiere@gmail.com>
jtcave pushed a commit to jtcave/cpython that referenced this pull request Jul 23, 2023
mementum pushed a commit to mementum/cpython that referenced this pull request Jul 23, 2023
serhiy-storchaka pushed a commit that referenced this pull request Aug 16, 2023
…orm exists (GH-19869) (GH-107107)

(cherry picked from commit 5463252)

Co-authored-by: Gilles Bassière <gbassiere@gmail.com>
m-aciek added a commit to m-aciek/attributivegettext that referenced this pull request Feb 16, 2024
After python/cpython#19869 PR merged gettext() can lookup plural() which is not set when constructor argument (file handler) is unspecified
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants