Kaydet (Commit) d3596477 authored tarafından Andrew Godwin's avatar Andrew Godwin

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

üst b22917bd
...@@ -173,7 +173,11 @@ class DjangoTranslation(gettext_module.GNUTranslations): ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment