From d6ee79f00736579062533a8f5953594e7496726f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gilles=20Bassi=C3=A8re?= <gbassiere@gmail.com>
Date: Sun, 23 Jul 2023 11:59:19 +0200
Subject: [PATCH] bpo-18319: gettext() can retrieve a message even if a plural
 form exists (GH-19869) (cherry picked from commit
 54632528eeba841e4a8cc95ecbd84c9aca8eef57)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Gilles Bassière <gbassiere@gmail.com>
---
 Lib/gettext.py                                         | 10 ++++++----
 Lib/test/test_gettext.py                               |  4 ++++
 .../Library/2020-05-03-00-33-15.bpo-18319.faPTlx.rst   |  2 ++
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2020-05-03-00-33-15.bpo-18319.faPTlx.rst

diff --git a/Lib/gettext.py b/Lib/gettext.py
index 6c5ec4e517f637..cc938e40028c24 100644
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -422,10 +422,12 @@ def gettext(self, message):
         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 1608d1b18e98fb..aa3520d2c142e4 100644
--- a/Lib/test/test_gettext.py
+++ b/Lib/test/test_gettext.py
@@ -320,6 +320,8 @@ def test_plural_forms1(self):
         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 @@ def test_plural_forms2(self):
         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 00000000000000..a1a4cf6d63725a
--- /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)`.