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

Fixed #29374 -- Ordered date filter's format strings by category.

This commit is contained in:
Brenton Cleeland 2018-06-04 14:37:42 +01:00 committed by Tim Graham
parent bec651a427
commit 3cf45af363
1 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1341,31 +1341,42 @@ Available format strings:
================ ======================================== ===================== ================ ======================================== =====================
Format character Description Example output Format character Description Example output
================ ======================================== ===================== ================ ======================================== =====================
a ``'a.m.'`` or ``'p.m.'`` (Note that ``'a.m.'`` **Day**
this is slightly different than PHP's
output, because this includes periods
to match Associated Press style.)
A ``'AM'`` or ``'PM'``. ``'AM'``
b Month, textual, 3 letters, lowercase. ``'jan'``
B Not implemented.
c ISO 8601 format. (Note: unlike others ``2008-01-02T10:30:00.000123+02:00``,
formatters, such as "Z", "O" or "r", or ``2008-01-02T10:30:00.000123`` if the datetime is naive
the "c" formatter will not add timezone
offset if value is a naive datetime
(see :class:`datetime.tzinfo`).
d Day of the month, 2 digits with ``'01'`` to ``'31'`` d Day of the month, 2 digits with ``'01'`` to ``'31'``
leading zeros. leading zeros.
j Day of the month without leading ``'1'`` to ``'31'``
zeros.
D Day of the week, textual, 3 letters. ``'Fri'`` D Day of the week, textual, 3 letters. ``'Fri'``
e Timezone name. Could be in any format, l Day of the week, textual, long. ``'Friday'``
or might return an empty string, ``''``, ``'GMT'``, ``'-500'``, ``'US/Eastern'``, etc. S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'``
depending on the datetime. month, 2 characters.
w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday)
leading zeros.
z Day of the year. ``0`` to ``365``
**Week**
W ISO-8601 week number of year, with ``1``, ``53``
weeks starting on Monday.
**Month**
m Month, 2 digits with leading zeros. ``'01'`` to ``'12'``
n Month without leading zeros. ``'1'`` to ``'12'``
style. Proprietary extension.
M Month, textual, 3 letters. ``'Jan'``
b Month, textual, 3 letters, lowercase. ``'jan'``
E Month, locale specific alternative E Month, locale specific alternative
representation usually used for long representation usually used for long
date representation. ``'listopada'`` (for Polish locale, as opposed to ``'Listopad'``) date representation. ``'listopada'`` (for Polish locale, as opposed to ``'Listopad'``)
f Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'``
with minutes left off if they're zero.
Proprietary extension.
F Month, textual, long. ``'January'`` F Month, textual, long. ``'January'``
N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'``
t Number of days in the given month. ``28`` to ``31``
**Year**
y Year, 2 digits. ``'99'``
Y Year, 4 digits. ``'1999'``
L Boolean for whether it's a leap year. ``True`` or ``False``
o ISO-8601 week-numbering year, ``'1999'``
corresponding to the ISO-8601 week
number (W) which uses leap weeks. See Y
for the more common year format.
**Time**
g Hour, 12-hour format without leading ``'1'`` to ``'12'`` g Hour, 12-hour format without leading ``'1'`` to ``'12'``
zeros. zeros.
G Hour, 24-hour format without leading ``'0'`` to ``'23'`` G Hour, 24-hour format without leading ``'0'`` to ``'23'``
@ -1373,47 +1384,42 @@ G Hour, 24-hour format without leading ``'0'`` to ``'23'``
h Hour, 12-hour format. ``'01'`` to ``'12'`` h Hour, 12-hour format. ``'01'`` to ``'12'``
H Hour, 24-hour format. ``'00'`` to ``'23'`` H Hour, 24-hour format. ``'00'`` to ``'23'``
i Minutes. ``'00'`` to ``'59'`` i Minutes. ``'00'`` to ``'59'``
I Daylight Savings Time, whether it's ``'1'`` or ``'0'`` s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'``
in effect or not. u Microseconds. ``000000`` to ``999999``
j Day of the month without leading ``'1'`` to ``'31'`` a ``'a.m.'`` or ``'p.m.'`` (Note that ``'a.m.'``
zeros. this is slightly different than PHP's
l Day of the week, textual, long. ``'Friday'`` output, because this includes periods
L Boolean for whether it's a leap year. ``True`` or ``False`` to match Associated Press style.)
m Month, 2 digits with leading zeros. ``'01'`` to ``'12'`` A ``'AM'`` or ``'PM'``. ``'AM'``
M Month, textual, 3 letters. ``'Jan'`` f Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'``
n Month without leading zeros. ``'1'`` to ``'12'`` with minutes left off if they're zero.
N Month abbreviation in Associated Press ``'Jan.'``, ``'Feb.'``, ``'March'``, ``'May'`` Proprietary extension.
style. Proprietary extension.
o ISO-8601 week-numbering year, ``'1999'``
corresponding to the ISO-8601 week
number (W) which uses leap weeks. See Y
for the more common year format.
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
if they're zero and the special-case if they're zero and the special-case
strings 'midnight' and 'noon' if strings 'midnight' and 'noon' if
appropriate. Proprietary extension. appropriate. Proprietary extension.
r :rfc:`5322` formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'`` **Timezone**
s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'`` e Timezone name. Could be in any format,
S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'`` or might return an empty string, ``''``, ``'GMT'``, ``'-500'``, ``'US/Eastern'``, etc.
month, 2 characters. depending on the datetime.
t Number of days in the given month. ``28`` to ``31`` I Daylight Savings Time, whether it's ``'1'`` or ``'0'``
in effect or not.
O Difference to Greenwich time in hours. ``'+0200'``
T Time zone of this machine. ``'EST'``, ``'MDT'`` T Time zone of this machine. ``'EST'``, ``'MDT'``
u Microseconds. ``000000`` to ``999999``
U Seconds since the Unix Epoch
(January 1 1970 00:00:00 UTC).
w Day of the week, digits without ``'0'`` (Sunday) to ``'6'`` (Saturday)
leading zeros.
W ISO-8601 week number of year, with ``1``, ``53``
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`` Z Time zone offset in seconds. The ``-43200`` to ``43200``
offset for timezones west of UTC is offset for timezones west of UTC is
always negative, and for those east of always negative, and for those east of
UTC is always positive. UTC is always positive.
**Date/Time**
c ISO 8601 format. (Note: unlike others ``2008-01-02T10:30:00.000123+02:00``,
formatters, such as "Z", "O" or "r", or ``2008-01-02T10:30:00.000123`` if the datetime is naive
the "c" formatter will not add timezone
offset if value is a naive datetime
(see :class:`datetime.tzinfo`).
r :rfc:`5322` formatted date. ``'Thu, 21 Dec 2000 16:01:07 +0200'``
U Seconds since the Unix Epoch
(January 1 1970 00:00:00 UTC).
================ ======================================== ===================== ================ ======================================== =====================
For example:: For example::