summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2005-10-22 21:37:59 +0000
committerAdrian Holovaty <adrian@holovaty.com>2005-10-22 21:37:59 +0000
commit17f62269c2168549b76ee6204a1423a6e6f4e5f5 (patch)
tree7b96011f7bf15748f3a0a6b9324b81632d7fb599 /docs
parentf82e64c6b2ade3e70553b3ec2743dfaa7456ddb3 (diff)
Fixed #479 -- Implemented time-zone formats in dateformat. Thanks, Sune
git-svn-id: http://code.djangoproject.com/svn/django/trunk@992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/templates.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/templates.txt b/docs/templates.txt
index 87cb296328..debec88a74 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -517,18 +517,18 @@ Built-in tag reference
n Month without leading zeros. ``'1'`` to ``'12'``
N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'``
style. Proprietary extension.
- O Not implemented.
+ O Difference to Greenwich time in hours. ``'+0200'``
P Time, in 12-hour hours, minutes and ``'1 a.m.'``, ``'1:30 p.m.'``, ``'midnight'``, ``'noon'``, ``'12:30 p.m.'``
'a.m.'/'p.m.', with minutes left off
if they're zero and the special-case
strings 'midnight' and 'noon' if
appropriate. Proprietary extension.
- r Not implemented.
+ r RFC 822 formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'``
s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'``
S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'``
month, 2 characters.
t Not implemented.
- T Not implemented.
+ T Time zone of this machine. ``'EST'``, ``'MDT'``
U Not implemented.
w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday)
leading zeros.
@@ -537,7 +537,10 @@ Built-in tag reference
y Year, 2 digits. ``'99'``
Y Year, 4 digits. ``'1999'``
z Day of the year. ``0`` to ``365``
- Z Not implemented.
+ Z Time zone offset in seconds. The ``-43200`` to ``43200``
+ offset for timezones west of UTC is
+ always negative, and for those east of
+ UTC is always positive.
================ ====================================== =====================
Example::