innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #5470 -- Fixed the 'Z' time format marker in templates to handle timezones west of UTC. Thanks, Paul Lanier. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@6275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-09-15 10:36:14 +00:00
parent c96c57afad
commit b984505d13
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -182,6 +182,7 @@ answer newbie questions, and generally made Django that much better:
lakin.wecker@gmail.com lakin.wecker@gmail.com
Nick Lane <nick.lane.au@gmail.com> Nick Lane <nick.lane.au@gmail.com>
Stuart Langridge <http://www.kryogenix.org/> Stuart Langridge <http://www.kryogenix.org/>
Paul Lanier <planier@google.com>
Nicola Larosa <nico@teknico.net> Nicola Larosa <nico@teknico.net>
Eugene Lazutkin <http://lazutkin.com/blog/> Eugene Lazutkin <http://lazutkin.com/blog/>
Jeong-Min Lee <falsetru@gmail.com> Jeong-Min Lee <falsetru@gmail.com>

13
django/utils/dateformat.py
View File

@ -248,10 +248,15 @@ class DateFormat(TimeFormat):
return doy return doy
def Z(self): def Z(self):
"""Time zone offset in seconds (i.e. '-43200' to '43200'). The offset """
for timezones west of UTC is always negative, and for those east of UTC Time zone offset in seconds (i.e. '-43200' to '43200'). The offset for
is always positive.""" timezones west of UTC is always negative, and for those east of UTC is
return self.timezone.utcoffset(self.data).seconds always positive.
"""
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
return offset.days * 86400 + offset.seconds
def format(value, format_string): def format(value, format_string):
"Convenience function" "Convenience function"