test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #21498: Don't use a fallback language if you're en-us.

This commit is contained in:
Andrew Godwin 2014-06-16 20:40:13 -07:00
parent b22917bd50
commit d359647715
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/utils/translation/trans_real.py
View File

@ -173,7 +173,11 @@ class DjangoTranslation(gettext_module.GNUTranslations):
def _add_fallback(self): def _add_fallback(self):
"""Sets the GNUTranslations() fallback with the default language.""" """Sets the GNUTranslations() fallback with the default language."""
if self.__language == settings.LANGUAGE_CODE: # Don't set a fallback for the default language or for
# en-us (as it's empty, so it'll ALWAYS fall back to the default
# language; found this as part of #21498, as we set en-us for
# management commands)
if self.__language == settings.LANGUAGE_CODE or self.__language == "en-us":
return return
default_translation = translation(settings.LANGUAGE_CODE) default_translation = translation(settings.LANGUAGE_CODE)
self.add_fallback(default_translation) self.add_fallback(default_translation)