diff options
| author | Claude Paroz <claude@2xlibre.net> | 2015-03-20 19:45:53 +0100 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2015-03-21 10:27:30 +0100 |
| commit | 9e83f30cd318693995decebdc68433853e93a6bb (patch) | |
| tree | e7193e7a0cf83fd0f89092c7978c6504e765f3a4 | |
| parent | aea02ddfb7c610db9a7cb291b113d6e561d8eba9 (diff) | |
Fixed #24515 -- Fixed DjangoTranslation plural handling
| -rw-r--r-- | django/utils/translation/trans_real.py | 3 | ||||
| -rw-r--r-- | tests/i18n/tests.py | 12 |
2 files changed, 13 insertions, 2 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index fa100a390c..2d86f46786 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -104,7 +104,6 @@ class DjangoTranslation(gettext_module.GNUTranslations): self.__language = language self.__to_language = to_language(language) self.__locale = to_locale(language) - self.plural = lambda n: int(n != 1) self._init_translation_catalog() self._add_installed_apps_translations() @@ -132,6 +131,7 @@ class DjangoTranslation(gettext_module.GNUTranslations): # provides merge support for NullTranslations() translation._catalog = {} translation._info = {} + translation.plural = lambda n: int(n != 1) return translation def _init_translation_catalog(self): @@ -144,6 +144,7 @@ class DjangoTranslation(gettext_module.GNUTranslations): # gettext will raise an IOError (refs #18192). use_null_fallback = False translation = self._new_gnu_trans(localedir, use_null_fallback) + self.plural = translation.plural self._info = translation._info.copy() self._catalog = translation._catalog.copy() diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index ad23861aea..34681790c0 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -30,7 +30,7 @@ from django.utils.translation import ( 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,6 +57,16 @@ def patch_formats(lang, **settings): 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: |