Commit41756e3

authored

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

(cherry picked from commitb3c34e5)Co-authored-by: Tomas R <tomas.roun8@gmail.com>Co-authored-by: Łukasz Langa <lukasz@langa.pl>

1 parent012bc13 commit41756e3Copy full SHA for 41756e3

File tree

+12

-4

lines changed

+12

-4

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -444,10 +444,12 @@ def pgettext(self, context, message):`
`444`	`444`	`missing=object()`
`445`	`445`	`tmsg=self._catalog.get(ctxt_msg_id,missing)`
`446`	`446`	`iftmsgismissing:`
`447`		`-ifself._fallback:`
`448`		`-returnself._fallback.pgettext(context,message)`
`449`		`-returnmessage`
`450`		`-returntmsg`
	`447`	`+tmsg=self._catalog.get((ctxt_msg_id,self.plural(1)),missing)`
	`448`	`+iftmsgisnotmissing:`
	`449`	`+returntmsg`
	`450`	`+ifself._fallback:`
	`451`	`+returnself._fallback.pgettext(context,message)`
	`452`	`+returnmessage`
`451`	`453`
`452`	`454`	`defnpgettext(self,context,msgid1,msgid2,n):`
`453`	`455`	`ctxt_msg_id=self.CONTEXT% (context,msgid1)`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -329,6 +329,8 @@ def test_plural_context_forms1(self):`
`329`	`329`	`x=gettext.npgettext('With context',`
`330`	`330`	`'There is %s file','There are %s files',2)`
`331`	`331`	`eq(x,'Hay %s ficheros (context)')`
	`332`	`+x=gettext.pgettext('With context','There is %s file')`
	`333`	`+eq(x,'Hay %s fichero (context)')`
`332`	`334`
`333`	`335`	`deftest_plural_forms2(self):`
`334`	`336`	`eq=self.assertEqual`
`@@ -349,6 +351,8 @@ def test_plural_context_forms2(self):`
`349`	`351`	`x=t.npgettext('With context',`
`350`	`352`	`'There is %s file','There are %s files',2)`
`351`	`353`	`eq(x,'Hay %s ficheros (context)')`
	`354`	`+x=gettext.pgettext('With context','There is %s file')`
	`355`	`+eq(x,'Hay %s fichero (context)')`
`352`	`356`
`353`	`357`	`# Examples from http://www.gnu.org/software/gettext/manual/gettext.html`
`354`	`358`

Lines changed: 2 additions & 0 deletions

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.`

Comments

(0)