diff options
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/translation/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py index 505d753268..a4c6963f0c 100644 --- a/django/utils/translation/__init__.py +++ b/django/utils/translation/__init__.py @@ -163,7 +163,9 @@ class override(ContextDecorator): deactivate_all() def __exit__(self, exc_type, exc_value, traceback): - if self.deactivate: + if self.old_language is None: + deactivate_all() + elif self.deactivate: deactivate() else: activate(self.old_language) |