diff options
| author | Claude Paroz <claude@2xlibre.net> | 2012-03-29 16:33:48 +0000 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2012-03-29 16:33:48 +0000 |
| commit | 8c54d7cf717cd2c861a87d2c68f90186e53f60a2 (patch) | |
| tree | 99a4225e650ba234dec1f6571700616ad5d10e98 | |
| parent | 782c1a770eada77edc5e947caec7bef715d5307d (diff) | |
Fixed #17947 -- Fixed language restore after management command even when exceptions occur. Thanks andrey@kostenko.name for the report and the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17823 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/core/management/base.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/django/core/management/base.py b/django/core/management/base.py index db855e1294..a9fc38cfaa 100644 --- a/django/core/management/base.py +++ b/django/core/management/base.py @@ -247,8 +247,9 @@ class BaseCommand(object): else: self.stderr.write(smart_str(self.style.ERROR('Error: %s\n' % e))) sys.exit(1) - if saved_lang is not None: - translation.activate(saved_lang) + finally: + if saved_lang is not None: + translation.activate(saved_lang) def validate(self, app=None, display_num_errors=False): """ |