summaryrefslogtreecommitdiff
path: root/django/template/debug.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-10-29 16:48:58 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-10-29 16:48:58 +0000
commitccc49029b8d84cf3eaaa3593df6370329f7b14e1 (patch)
tree3e88f1a774a557cae46a7095073ccf6e05e7fff8 /django/template/debug.py
parent269e921756371bee6d35a967bc2ffe84d1ae39eb (diff)
Fixed #14181 -- Added a template tag and filters to allow localization to be disabled in a template. Thanks to Benjamin Wohlwend for the work on the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14395 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/template/debug.py')
-rw-r--r--django/template/debug.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/django/template/debug.py b/django/template/debug.py
index c21fb50b3e..aa42b2b5ca 100644
--- a/django/template/debug.py
+++ b/django/template/debug.py
@@ -1,3 +1,4 @@
+from django.conf import settings
from django.template import Lexer, Parser, tag_re, NodeList, VariableNode, TemplateSyntaxError
from django.utils.encoding import force_unicode
from django.utils.html import escape
@@ -87,7 +88,7 @@ class DebugVariableNode(VariableNode):
def render(self, context):
try:
output = self.filter_expression.resolve(context)
- output = localize(output)
+ output = localize(value, use_l10n=use_l10n)
output = force_unicode(output)
except TemplateSyntaxError, e:
if not hasattr(e, 'source'):