[3.11] gh-62519: Make pgettext search plurals when translation is not found (GH-107118) (GH-107133)

miss-islington · tomasr8 · ambv · web-flow · commit 41756e3960a3 · 2023-07-25T21:49:28.000+03:00
(cherry picked from commit b3c34e5) Co-authored-by: Tomas R <tomas.roun8@gmail.com> Co-authored-by: Łukasz Langa <lukasz@langa.pl>
diff --git a/Lib/gettext.py b/Lib/gettext.py
@@ -444,10 +444,12 @@ def pgettext(self, context, message):
         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
@@ -329,6 +329,8 @@ def test_plural_context_forms1(self):
         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
@@ -349,6 +351,8 @@ def test_plural_context_forms2(self):
         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
@@ -0,0 +1,2 @@
+Make :func:`gettext.pgettext` search plural definitions when
+translation is not found.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Make :func:`gettext.pgettext` search plural definitions when
	`2`	`+translation is not found.`