From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 23 Jul 2023 12:29:08 +0000 (-0700)
Subject: [3.12] bpo-18319: gettext() can retrieve a message even if a plural form exists ... 
X-Git-Tag: v3.12.0rc1~91
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd72fb19ef1a01fde067109288ecacc62121f0ae;p=thirdparty%2FPython%2Fcpython.git

[3.12] bpo-18319: gettext() can retrieve a message even if a plural form exists (GH-19869) (#107108)

(cherry picked from commit 54632528eeba841e4a8cc95ecbd84c9aca8eef57)

Co-authored-by: Gilles Bassière <gbassiere@gmail.com>
---

diff --git a/Lib/gettext.py b/Lib/gettext.py
index 6c5ec4e517f6..cc938e40028c 100644
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -422,10 +422,12 @@ class GNUTranslations(NullTranslations):
         missing = object()
         tmsg = self._catalog.get(message, missing)
         if tmsg is missing:
-            if self._fallback:
-                return self._fallback.gettext(message)
-            return message
-        return tmsg
+            tmsg = self._catalog.get((message, self.plural(1)), missing)
+        if tmsg is not missing:
+            return tmsg
+        if self._fallback:
+            return self._fallback.gettext(message)
+        return message
 
     def ngettext(self, msgid1, msgid2, n):
         try:
diff --git a/Lib/test/test_gettext.py b/Lib/test/test_gettext.py
index 1608d1b18e98..aa3520d2c142 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -320,6 +320,8 @@ class PluralFormsTestCase(GettextBaseTest):
         eq(x, 'Hay %s fichero')
         x = gettext.ngettext('There is %s file', 'There are %s files', 2)
         eq(x, 'Hay %s ficheros')
+        x = gettext.gettext('There is %s file')
+        eq(x, 'Hay %s fichero')
 
     def test_plural_context_forms1(self):
         eq = self.assertEqual
@@ -338,6 +340,8 @@ class PluralFormsTestCase(GettextBaseTest):
         eq(x, 'Hay %s fichero')
         x = t.ngettext('There is %s file', 'There are %s files', 2)
         eq(x, 'Hay %s ficheros')
+        x = t.gettext('There is %s file')
+        eq(x, 'Hay %s fichero')
 
     def test_plural_context_forms2(self):
         eq = self.assertEqual
diff --git a/Misc/NEWS.d/next/Library/2020-05-03-00-33-15.bpo-18319.faPTlx.rst b/Misc/NEWS.d/next/Library/2020-05-03-00-33-15.bpo-18319.faPTlx.rst
new file mode 100644
index 000000000000..a1a4cf6d6372
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-05-03-00-33-15.bpo-18319.faPTlx.rst
@@ -0,0 +1,2 @@
+Ensure `gettext(msg)` retrieve translations even if a plural form exists. In
+other words: `gettext(msg) == ngettext(msg, '', 1)`.