From 3cf45af3630890ad85112f9ea8af869c8daef17b Mon Sep 17 00:00:00 2001 From: Brenton Cleeland Date: Mon, 4 Jun 2018 14:37:42 +0100 Subject: [PATCH] Fixed #29374 -- Ordered date filter's format strings by category. --- docs/ref/templates/builtins.txt | 104 +++++++++++++++++--------------- 1 file changed, 55 insertions(+), 49 deletions(-) diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index a4e0a0d455..a3e429d1c4 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1341,31 +1341,42 @@ 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.) -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`). +**Day** d Day of the month, 2 digits with ``'01'`` to ``'31'`` leading zeros. +j Day of the month without leading ``'1'`` to ``'31'`` + zeros. D Day of the week, textual, 3 letters. ``'Fri'`` -e Timezone name. Could be in any format, - or might return an empty string, ``''``, ``'GMT'``, ``'-500'``, ``'US/Eastern'``, etc. - depending on the datetime. +l Day of the week, textual, long. ``'Friday'`` +S English ordinal suffix for day of the ``'st'``, ``'nd'``, ``'rd'`` or ``'th'`` + 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 representation usually used for long 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'`` +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'`` zeros. 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, 24-hour format. ``'00'`` to ``'23'`` i Minutes. ``'00'`` to ``'59'`` -I Daylight Savings Time, whether it's ``'1'`` or ``'0'`` - in effect or not. -j Day of the month without leading ``'1'`` to ``'31'`` - 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. -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'`` +s Seconds, 2 digits with leading zeros. ``'00'`` to ``'59'`` +u Microseconds. ``000000`` to ``999999`` +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.) +A ``'AM'`` or ``'PM'``. ``'AM'`` +f Time, in 12-hour hours and minutes, ``'1'``, ``'1:30'`` + with minutes left off if they're zero. + Proprietary extension. 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 :rfc:`5322` 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 Number of days in the given month. ``28`` to ``31`` +**Timezone** +e Timezone name. Could be in any format, + or might return an empty string, ``''``, ``'GMT'``, ``'-500'``, ``'US/Eastern'``, etc. + depending on the datetime. +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'`` -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`` offset for timezones west of UTC is always negative, and for those east of 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::