From 16bb9c594cf7306f4b2fc3ba915be43b05dad5d2 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 8 Sep 2011 13:24:41 +0000 Subject: Fixed #16516 -- Relaxed the blocktrans rendering a little by falling back to the default language if resolving one of the arguments fails, raising a KeyError. Thanks, Claude Paroz and Aymeric Augustin. git-svn-id: http://code.djangoproject.com/svn/django/trunk@16723 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/translation/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'django/utils') diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py index acf4d8dead..8ad9c5d59a 100644 --- a/django/utils/translation/__init__.py +++ b/django/utils/translation/__init__.py @@ -115,7 +115,10 @@ class override(object): self.old_language = get_language() def __enter__(self): - activate(self.language) + if self.language is not None: + activate(self.language) + else: + deactivate_all() def __exit__(self, exc_type, exc_value, traceback): if self.deactivate: -- cgit v1.3