From caaa01142d349c42f9f72bac8af83023b0b84d3f Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Sat, 26 Jan 2019 16:44:49 +0100
Subject: [2.2.x] Fixed #29825 -- Fixed JS ngettext if the string is a
 non-plural msgid in the catalog.

Backport of 16454ac35f6a24a04b23a9340b0d62c33edbc1ea from master.
---
 django/views/i18n.py                               |   2 +-
 tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo | Bin 615 -> 671 bytes
 tests/view_tests/locale/de/LC_MESSAGES/djangojs.po |   3 +++
 tests/view_tests/templates/jsi18n.html             |   7 +++++++
 tests/view_tests/tests/test_i18n.py                |   2 ++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/django/views/i18n.py b/django/views/i18n.py
index 3bd240ea3d..f684da23dc 100644
--- a/django/views/i18n.py
+++ b/django/views/i18n.py
@@ -113,7 +113,7 @@ js_catalog_template = r"""
       if (typeof(value) == 'undefined') {
         return (count == 1) ? singular : plural;
       } else {
-        return value[django.pluralidx(count)];
+        return value.constructor === Array ? value[django.pluralidx(count)] : value;
       }
     };
 
diff --git a/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo
index 34ba691029..4ff1972928 100644
Binary files a/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo and b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo differ
diff --git a/tests/view_tests/locale/de/LC_MESSAGES/djangojs.po b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.po
index 03036e48ff..ed6ed226d2 100644
--- a/tests/view_tests/locale/de/LC_MESSAGES/djangojs.po
+++ b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.po
@@ -39,3 +39,6 @@ msgid "%s result"
 msgid_plural "%s results"
 msgstr[0] "%s Resultat"
 msgstr[1] "%s Resultate"
+
+msgid "Image"
+msgstr "Bild"
diff --git a/tests/view_tests/templates/jsi18n.html b/tests/view_tests/templates/jsi18n.html
index df1c4b400c..f0bd17c199 100644
--- a/tests/view_tests/templates/jsi18n.html
+++ b/tests/view_tests/templates/jsi18n.html
@@ -30,6 +30,13 @@
     </script>
   </p>
 
+  <p id="ngettext_onnonplural">
+      <!-- The po file only contains the non plural "Image" string. -->
+      <script type="text/javascript">
+          document.write(interpolate(ngettext("Image", "Images", 5), [1]));
+      </script>
+  </p>
+
   <p id="pgettext">
     <script type="text/javascript">
     document.write(pgettext("verb", "May"));
diff --git a/tests/view_tests/tests/test_i18n.py b/tests/view_tests/tests/test_i18n.py
index 8a56743688..a3463a1bab 100644
--- a/tests/view_tests/tests/test_i18n.py
+++ b/tests/view_tests/tests/test_i18n.py
@@ -435,6 +435,8 @@ class I18nSeleniumTests(SeleniumTestCase):
         self.assertEqual(elem.text, "1 Element")
         elem = self.selenium.find_element_by_id("ngettext_plur")
         self.assertEqual(elem.text, "455 Elemente")
+        elem = self.selenium.find_element_by_id("ngettext_onnonplural")
+        self.assertEqual(elem.text, "Bild")
         elem = self.selenium.find_element_by_id("pgettext")
         self.assertEqual(elem.text, "Kann")
         elem = self.selenium.find_element_by_id("npgettext_sing")
-- 
cgit v1.3