mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-18 02:56:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #24515 -- Fixed DjangoTranslation plural handling

Browse source
This commit is contained in:
Claude Paroz 2015-03-20 19:45:53 +01:00
parent aea02ddfb7
commit 9e83f30cd3
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
django/utils/translation/trans_real.py
View file

@ -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()