mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #15092 -- Made {% now %} work with single-quoted string arguments. Thanks to ninja_otoko for the report and to steveire, Aymeric Augustin and Claude Paroz for the patch.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17391 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Julien Phalip
2012-01-24 08:02:34 +00:00
parent 804bd40383
commit 6ae393d74d
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/regressiontests/templates/tests.py
View File

@@ -1462,14 +1462,18 @@ class Templates(unittest.TestCase):
### NOW TAG ########################################################
# Simple case
'now01': ('{% now "j n Y"%}', {}, str(datetime.now().day) + ' ' + str(datetime.now().month) + ' ' + str(datetime.now().year)),
# Check parsing of escaped and special characters
'now02': ('{% now "j "n" Y"%}', {}, template.TemplateSyntaxError),
# 'now03': ('{% now "j \"n\" Y"%}', {}, str(datetime.now().day) + '"' + str(datetime.now().month) + '"' + str(datetime.now().year)),
# 'now04': ('{% now "j \nn\n Y"%}', {}, str(datetime.now().day) + '\n' + str(datetime.now().month) + '\n' + str(datetime.now().year))
'now01': ('{% now "j n Y" %}', {}, "%d %d %d" % (
datetime.now().day, datetime.now().month, datetime.now().year)),
# Check parsing of locale strings
'now05': ('{% now "DATE_FORMAT" %}', {}, date_format(datetime.now())),
'now02': ('{% now "DATE_FORMAT" %}', {}, date_format(datetime.now())),
# Also accept simple quotes - #15092
'now03': ("{% now 'j n Y' %}", {}, "%d %d %d" % (
datetime.now().day, datetime.now().month, datetime.now().year)),
'now04': ("{% now 'DATE_FORMAT' %}", {}, date_format(datetime.now())),
'now05': ('''{% now 'j "n" Y'%}''', {}, '''%d "%d" %d''' % (
datetime.now().day, datetime.now().month, datetime.now().year)),
'now06': ('''{% now "j 'n' Y"%}''', {}, '''%d '%d' %d''' % (
datetime.now().day, datetime.now().month, datetime.now().year)),
### URL TAG ########################################################
# Successes