pythongh-62519: Make pgettext search plurals when translation is not …

…found (python#107118)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>

Lib/gettext.py

@@ -446,10 +446,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)

Lib/test/test_gettext.py

@@ -331,6 +331,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
@@ -353,6 +355,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
 

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.