diff options
| -rw-r--r-- | django/utils/translation/trans_real.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index dda2ab54c3..71445cb365 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -173,7 +173,11 @@ class DjangoTranslation(gettext_module.GNUTranslations): def _add_fallback(self): """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 default_translation = translation(settings.LANGUAGE_CODE) self.add_fallback(default_translation) |