Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed ReST bug in templates.txt

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 72547994c12bd77b804e7e9a03c94ca80988cc44 1 parent bd0d8a7
Adrian Holovaty adrianholovaty authored
Showing with 20 additions and 20 deletions.
  1. +20 −20 docs/templates.txt
40 docs/templates.txt
View
@@ -513,59 +513,59 @@ Available format strings:
Format character Description Example output
================ ======================================== =====================
a ``'a.m.'`` or ``'p.m.'`` (Note that ``'a.m.'``
- this is slightly different than PHP's
- output, because this includes periods
- to match Associated Press style.)
+ this is slightly different than PHP's
+ output, because this includes periods
+ to match Associated Press style.)
A ``'AM'`` or ``'PM'``. ``'AM'``
B Not implemented.
d Day of the month, 2 digits with ``'01'`` to ``'31'``
- leading zeros.
+ leading zeros.
D Day of the week, textual, 3 letters. ``'Fri'``
f Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'``
- with minutes left off if they're zero.
- Proprietary extension.
+ with minutes left off if they're zero.
+ Proprietary extension.
F Month, textual, long. ``'January'``
g Hour, 12-hour format without leading ``'1'`` to ``'12'``
- zeros.
+ zeros.
G Hour, 24-hour format without leading ``'0'`` to ``'23'``
- zeros.
+ zeros.
h Hour, 12-hour format. ``'01'`` to ``'12'``
H Hour, 24-hour format. ``'00'`` to ``'23'``
i Minutes. ``'00'`` to ``'59'``
I Not implemented.
j Day of the month without leading ``'1'`` to ``'31'``
- zeros.
+ zeros.
l Day of the week, textual, long. ``'Friday'``
L Boolean for whether it's a leap year. ``True`` or ``False``
m Month, 2 digits with leading zeros. ``'01'`` to ``'12'``
M Month, textual, 3 letters. ``'Jan'``
n Month without leading zeros. ``'1'`` to ``'12'``
N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'``
- style. Proprietary extension.
+ style. Proprietary extension.
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.
+ '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 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.
+ month, 2 characters.
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.
+ leading zeros.
W ISO-8601 week number of year, with ``1``, ``23``
- weeks starting on Monday.
+ weeks starting on Monday.
y Year, 2 digits. ``'99'``
Y Year, 4 digits. ``'1999'``
z Day of the year. ``0`` to ``365``
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.
+ offset for timezones west of UTC is
+ always negative, and for those east of
+ UTC is always positive.
================ ======================================== =====================
Example::
Please sign in to comment.
Something went wrong with that request. Please try again.