From 8c54d7cf717cd2c861a87d2c68f90186e53f60a2 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Thu, 29 Mar 2012 16:33:48 +0000 Subject: [PATCH] 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 --- django/core/management/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/django/core/management/base.py b/django/core/management/base.py index db855e12941..a9fc38cfaa0 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): """