diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-07-25 18:48:59 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-25 18:48:59 (GMT) |
| commit | 11d86c5c339abd52d1ab5ce0af4d25c44898d046 (patch) | |
| tree | 3229a81d0b2b8f7f885185f0eaa731b913dd5184 | |
| parent | 313284aa423252ebd5d4e761220e0f4fdeac626d (diff) | |
| download | cpython-11d86c5c339abd52d1ab5ce0af4d25c44898d046.zip cpython-11d86c5c339abd52d1ab5ce0af4d25c44898d046.tar.gz cpython-11d86c5c339abd52d1ab5ce0af4d25c44898d046.tar.bz2 | |
[3.12] gh-62519: Make pgettext search plurals when translation is not found (GH-107118) (GH-107134)
(cherry picked from commit b3c34e55c053846beb35f5e4253ef237b3494bd0)
Co-authored-by: Tomas R <tomas.roun8@gmail.com>
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
| -rw-r--r-- | Lib/gettext.py | 10 | ||||
| -rw-r--r-- | Lib/test/test_gettext.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2023-07-23-12-26-23.gh-issue-62519.w8-81X.rst | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Lib/gettext.py b/Lib/gettext.py index cc938e40..b72b15f 100644 --- a/Lib/gettext.py +++ b/Lib/gettext.py @@ -446,10 +446,12 @@ class GNUTranslations(NullTranslations): missing = object() tmsg = self._catalog.get(ctxt_msg_id, missing) if tmsg is missing: - if self._fallback: - return self._fallback.pgettext(context, message) - return message - return tmsg + tmsg = self._catalog.get((ctxt_msg_id, self.plural(1)), missing) + if tmsg is not missing: + return tmsg + if self._fallback: + return self._fallback.pgettext(context, message) + return message def npgettext(self, context, msgid1, msgid2, n): ctxt_msg_id = self.CONTEXT % (context, msgid1) diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py index aa3520d..8430fc2 100644 --- a/Lib/test/test_gettext.py +++ b/Lib/test/test_gettext.py @@ -331,6 +331,8 @@ class PluralFormsTestCase(GettextBaseTest): x = gettext.npgettext('With context', 'There is %s file', 'There are %s files', 2) eq(x, 'Hay %s ficheros (context)') + x = gettext.pgettext('With context', 'There is %s file') + eq(x, 'Hay %s fichero (context)') def test_plural_forms2(self): eq = self.assertEqual @@ -353,6 +355,8 @@ class PluralFormsTestCase(GettextBaseTest): x = t.npgettext('With context', 'There is %s file', 'There are %s files', 2) eq(x, 'Hay %s ficheros (context)') + x = gettext.pgettext('With context', 'There is %s file') + eq(x, 'Hay %s fichero (context)') # Examples from http://www.gnu.org/software/gettext/manual/gettext.html diff --git a/Misc/NEWS.d/next/Library/2023-07-23-12-26-23.gh-issue-62519.w8-81X.rst b/Misc/NEWS.d/next/Library/2023-07-23-12-26-23.gh-issue-62519.w8-81X.rst new file mode 100644 index 0000000..96e2a3d --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-07-23-12-26-23.gh-issue-62519.w8-81X.rst @@ -0,0 +1,2 @@ +Make :func:`gettext.pgettext` search plural definitions when +translation is not found. |