Plural handling broken

[Claude Paroz]

Translation of plural strings is currently not following the plural equation from the po files and enforce the English default equation.

tests/i18n/tests.py

@@ -30 +30 @@
     get_language, get_language_from_request, get_language_info, gettext,
     gettext_lazy, ngettext_lazy, npgettext, npgettext_lazy, pgettext,
     pgettext_lazy, string_concat, to_locale, trans_real, ugettext,
-    ugettext_lazy, ungettext_lazy,
+    ugettext_lazy, ungettext, ungettext_lazy,
 )
 
 from .forms import CompanyForm, I18nForm, SelectDateForm
@@ -57 +57 @@
 
 class TranslationTests(TestCase):
 
+    @translation.override('fr')
+    def test_plural(self):
+        """
+        Test plurals with ungettext. French differs from English in that 0 is singular.
+        """
+        self.assertEqual(ungettext("%d year", "%d years", 0) % 0, "0 année")
+        self.assertEqual(ungettext("%d year", "%d years", 2) % 2, "2 années")
+        self.assertEqual(ungettext("%(size)d byte", "%(size)d bytes", 0) % {'size': 0}, "0 octet")
+        self.assertEqual(ungettext("%(size)d byte", "%(size)d bytes", 2) % {'size': 2}, "2 octets")
+
     def test_override(self):
         activate('de')
         try:

[Claude Paroz]

​https://github.com/django/django/pull/4356

[Claude Paroz <claude@…>]

In 9e83f30:

Fixed #24515 -- Fixed DjangoTranslation plural handling

[Claude Paroz <claude@…>]

In 8e4b0d6:

[1.8.x] Fixed #24515 -- Fixed DjangoTranslation plural handling

Backport of 9e83f30cd31 from master.