diff options
| author | Claude Paroz <claude@2xlibre.net> | 2019-01-26 16:44:49 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-01-28 18:17:52 -0500 |
| commit | caaa01142d349c42f9f72bac8af83023b0b84d3f (patch) | |
| tree | c3f3e0f86efcd25290ecd489a62b0e7b5756e0c7 /tests | |
| parent | 728358c5cf96898a00eea2f81a2e305c0754f0c3 (diff) | |
[2.2.x] Fixed #29825 -- Fixed JS ngettext if the string is a non-plural msgid in the catalog.
Backport of 16454ac35f6a24a04b23a9340b0d62c33edbc1ea from master.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo | bin | 615 -> 671 bytes | |||
| -rw-r--r-- | tests/view_tests/locale/de/LC_MESSAGES/djangojs.po | 3 | ||||
| -rw-r--r-- | tests/view_tests/templates/jsi18n.html | 7 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_i18n.py | 2 |
4 files changed, 12 insertions, 0 deletions
diff --git a/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo Binary files differindex 34ba691029..4ff1972928 100644 --- a/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo +++ b/tests/view_tests/locale/de/LC_MESSAGES/djangojs.mo 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") |