Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
This commit is contained in:
Tomas R 2023-07-23 16:08:28 +02:00 committed by GitHub
parent b273837fea
commit b3c34e55c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/gettext.py
View File

@ -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)

4
Lib/test/test_gettext.py
View File

@ -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

2
Misc/NEWS.d/next/Library/2023-07-23-12-26-23.gh-issue-62519.w8-81X.rst Normal file
View File

@ -0,0 +1,2 @@
Make :func:`gettext.pgettext` search plural definitions when
translation is not found.