summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorThomas Chaumeny <thomas.chaumeny@polyconseil.fr>2014-08-19 18:44:10 +0200
committerSimon Charette <charette.s@gmail.com>2014-08-28 11:58:21 -0400
commit2db1ed1033c0f542b3ffcbbb970d1b4dc881900f (patch)
tree7ea8b0c3ef6e8064078790ba6c83c73ada9696f1 /django
parent191d953c99b2b437370612fb63b1247a4f543e5e (diff)
Fixed #23323 -- Made django.utils.translation.override usable as a decorator.
Diffstat (limited to 'django')
-rw-r--r--django/utils/translation/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/utils/translation/__init__.py b/django/utils/translation/__init__.py
index 14056d4759..70eb01d2d7 100644
--- a/django/utils/translation/__init__.py
+++ b/django/utils/translation/__init__.py
@@ -3,6 +3,7 @@ Internationalization support.
"""
from __future__ import unicode_literals
import re
+from django.utils.decorators import ContextDecorator
from django.utils.encoding import force_text
from django.utils.functional import lazy
from django.utils import six
@@ -149,7 +150,7 @@ def deactivate():
return _trans.deactivate()
-class override(object):
+class override(ContextDecorator):
def __init__(self, language, deactivate=False):
self.language = language
self.deactivate = deactivate