1
0
mirror of https://github.com/django/django.git synced 2025-10-30 17:16:10 +00:00

Fixed #17992 -- Added a public API for localtime.

Thanks Bradley Ayers for the report.
This commit is contained in:
Aymeric Augustin
2012-04-29 15:37:23 +02:00
parent 5aa51fa999
commit 3e8b40f479
9 changed files with 65 additions and 35 deletions

View File

@@ -18,7 +18,7 @@ from django.utils.safestring import (SafeData, EscapeData, mark_safe,
from django.utils.formats import localize
from django.utils.html import escape
from django.utils.module_loading import module_has_submodule
from django.utils.timezone import localtime
from django.utils.timezone import template_localtime
TOKEN_TEXT = 0
@@ -592,7 +592,7 @@ class FilterExpression(object):
else:
arg_vals.append(arg.resolve(context))
if getattr(func, 'expects_localtime', False):
obj = localtime(obj, context.use_tz)
obj = template_localtime(obj, context.use_tz)
if getattr(func, 'needs_autoescape', False):
new_obj = func(obj, autoescape=context.autoescape, *arg_vals)
else:
@@ -853,7 +853,7 @@ def _render_value_in_context(value, context):
means escaping, if required, and conversion to a unicode object. If value
is a string, it is expected to have already been translated.
"""
value = localtime(value, use_tz=context.use_tz)
value = template_localtime(value, use_tz=context.use_tz)
value = localize(value, use_l10n=context.use_l10n)
value = force_unicode(value)
if ((context.autoescape and not isinstance(value, SafeData)) or

View File

@@ -3,7 +3,7 @@ from django.utils.encoding import force_unicode
from django.utils.html import escape
from django.utils.safestring import SafeData, EscapeData
from django.utils.formats import localize
from django.utils.timezone import localtime
from django.utils.timezone import template_localtime
class DebugLexer(Lexer):
@@ -82,7 +82,7 @@ class DebugVariableNode(VariableNode):
def render(self, context):
try:
output = self.filter_expression.resolve(context)
output = localtime(output, use_tz=context.use_tz)
output = template_localtime(output, use_tz=context.use_tz)
output = localize(output, use_l10n=context.use_l10n)
output = force_unicode(output)
except UnicodeDecodeError: