mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
Fixed #12444 - Date based widgets now correctly handle input values when using locale-aware formatting. Also fixes #7656.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
@@ -10,6 +10,8 @@ tests = r"""
|
||||
... from decimal import Decimal
|
||||
... except ImportError:
|
||||
... from django.utils._decimal import Decimal
|
||||
>>> from django.utils.translation import activate, deactivate
|
||||
>>> from django.conf import settings
|
||||
|
||||
###########
|
||||
# Widgets #
|
||||
@@ -1082,6 +1084,13 @@ True
|
||||
False
|
||||
>>> w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'06/05/2008', u'12:41'])
|
||||
True
|
||||
>>> activate('de-at')
|
||||
>>> settings.USE_L10N = True
|
||||
>>> w._has_changed(datetime.datetime(2008, 5, 6, 12, 40, 00), [u'06.05.2008', u'12:41'])
|
||||
True
|
||||
>>> deactivate()
|
||||
>>> settings.USE_L10N = False
|
||||
|
||||
|
||||
# DateTimeInput ###############################################################
|
||||
|
||||
@@ -1099,6 +1108,12 @@ u'<input type="text" name="date" value="2007-09-17 12:51:34" />'
|
||||
u'<input type="text" name="date" value="2007-09-17 12:51:34" />'
|
||||
>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
|
||||
u'<input type="text" name="date" value="2007-09-17 12:51:00" />'
|
||||
>>> activate('de-at')
|
||||
>>> settings.USE_L10N = True
|
||||
>>> w.render('date', d)
|
||||
u'<input type="text" name="date" value="17.09.2007 12:51:34" />'
|
||||
>>> deactivate()
|
||||
>>> settings.USE_L10N = False
|
||||
|
||||
Use 'format' to change the way a value is displayed.
|
||||
>>> w = DateTimeInput(format='%d/%m/%Y %H:%M')
|
||||
@@ -1107,6 +1122,7 @@ u'<input type="text" name="date" value="17/09/2007 12:51" />'
|
||||
>>> w._has_changed(d, '17/09/2007 12:51')
|
||||
False
|
||||
|
||||
|
||||
# DateInput ###################################################################
|
||||
|
||||
>>> w = DateInput()
|
||||
@@ -1125,6 +1141,13 @@ We should be able to initialize from a unicode value.
|
||||
>>> w.render('date', u'2007-09-17')
|
||||
u'<input type="text" name="date" value="2007-09-17" />'
|
||||
|
||||
>>> activate('de-at')
|
||||
>>> settings.USE_L10N = True
|
||||
>>> w.render('date', d)
|
||||
u'<input type="text" name="date" value="17.09.2007" />'
|
||||
>>> deactivate()
|
||||
>>> settings.USE_L10N = False
|
||||
|
||||
Use 'format' to change the way a value is displayed.
|
||||
>>> w = DateInput(format='%d/%m/%Y')
|
||||
>>> w.render('date', d)
|
||||
@@ -1153,6 +1176,13 @@ We should be able to initialize from a unicode value.
|
||||
>>> w.render('time', u'13:12:11')
|
||||
u'<input type="text" name="time" value="13:12:11" />'
|
||||
|
||||
>>> activate('de-at')
|
||||
>>> settings.USE_L10N = True
|
||||
>>> w.render('date', d)
|
||||
u'<input type="text" name="date" value="17.09.2007" />'
|
||||
>>> deactivate()
|
||||
>>> settings.USE_L10N = False
|
||||
|
||||
Use 'format' to change the way a value is displayed.
|
||||
>>> w = TimeInput(format='%H:%M')
|
||||
>>> w.render('time', t)
|
||||
@@ -1176,6 +1206,12 @@ u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" n
|
||||
u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:34" />'
|
||||
>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
|
||||
u'<input type="hidden" name="date_0" value="2007-09-17" /><input type="hidden" name="date_1" value="12:51:00" />'
|
||||
>>> activate('de-at')
|
||||
>>> settings.USE_L10N = True
|
||||
>>> w.render('date', datetime.datetime(2007, 9, 17, 12, 51))
|
||||
u'<input type="hidden" name="date_0" value="17.09.2007" /><input type="hidden" name="date_1" value="12:51:00" />'
|
||||
>>> deactivate()
|
||||
>>> settings.USE_L10N = False
|
||||
|
||||
"""
|
||||
|
||||
|
||||
Reference in New Issue
Block a user