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

Fixed #26275 -- Noted difference between o and Y date format chars.

This commit is contained in:
inondle 2016-02-26 13:44:22 -08:00 committed by Tim Graham
parent 5e2c4d7afb
commit 5fb9756eba
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/ref/templates/builtins.txt
View File

@ -1294,8 +1294,9 @@ n Month without leading zeros. ``'1'`` to ``'12'``
N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'`` N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'``
style. Proprietary extension. style. Proprietary extension.
o ISO-8601 week-numbering year, ``'1999'`` o ISO-8601 week-numbering year, ``'1999'``
corresponding to corresponding to the ISO-8601 week
the ISO-8601 week number (W) number (W) which uses leap weeks. See Y
for the more common year format.
O Difference to Greenwich time in hours. ``'+0200'`` 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.'`` 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 'a.m.'/'p.m.', with minutes left off