diff options
Diffstat (limited to 'django/utils')
| -rw-r--r-- | django/utils/translation/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
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: |