summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorPatryk Zawadzki <patrys@room-303.com>2018-02-19 19:09:33 +0100
committerTim Graham <timograham@gmail.com>2018-03-03 12:08:24 -0500
commita20aae414e762e4d9043e76b0bf8eccd334c8ebc (patch)
treeb15ab89cef411f96c48071d79c8cc0a60444bb54 /django
parent939e0a5995357ad0597565ad19a8d99216fa14e4 (diff)
Fixed #29144 -- Made untranslated strings for territorial language variants use translations from the generic language variant.
Diffstat (limited to 'django')
-rw-r--r--django/utils/translation/trans_real.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index 7d6ef125b5..af11c2ac35 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -202,6 +202,8 @@ class DjangoTranslation(gettext_module.GNUTranslations):
self._catalog = other._catalog.copy()
else:
self._catalog.update(other._catalog)
+ if other._fallback:
+ self.add_fallback(other._fallback)
def language(self):
"""Return the translation language."""