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 /django | |
| parent | aea02ddfb7c610db9a7cb291b113d6e561d8eba9 (diff) | |
Fixed #24515 -- Fixed DjangoTranslation plural handling
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/translation/trans_real.py | 3 |
1 files changed, 2 insertions, 1 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() |