mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-18 16:30:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #16924 -- Corrected date template filter handling of negative (West of UTC) timezone offsets.

Browse source 
The 'O' format specifier output was incorrect. Thanks mrgriscom and Aymeric Augustin.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2011-09-25 17:08:31 +00:00
parent 482388cd61
commit 3ef1762cb9
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
django/utils/dateformat.py
View file

@ -182,9 +182,11 @@ class DateFormat(TimeFormat):
return MONTHS_AP[self.data.month]
def O(self):
"Difference to Greenwich time in hours; e.g. '+0200'"
"Difference to Greenwich time in hours; e.g. '+0200', '-0430'"
seconds = self.Z()
return u"%+03d%02d" % (seconds // 3600, (seconds // 60) % 60)
sign = '-' if seconds < 0 else '+'
seconds = abs(seconds)
return u"%s%02d%02d" % (sign, seconds // 3600, (seconds // 60) % 60)
def r(self):
"RFC 2822 formatted date; e.g. 'Thu, 21 Dec 2000 16:01:07 +0200'"
@ -275,8 +277,10 @@ class DateFormat(TimeFormat):
if not self.timezone:
return 0
offset = self.timezone.utcoffset(self.data)
# Only days can be negative, so negative offsets have days=-1 and
# seconds positive. Positive offsets have days=0
# `offset` is a datetime.timedelta. For negative values (to the west of
# UTC) only days can be negative (days=-1) and seconds are always
# positive. e.g. UTC-1 -> timedelta(days=-1, seconds=82800, microseconds=0)
# Positive offsets have days=0
return offset.days * 86400 + offset.seconds
def format(value, format_string):