summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2017-03-27 18:53:03 +0200
committerTim Graham <timograham@gmail.com>2017-03-27 12:53:03 -0400
commit6585ebebaaa58aeef45210a3119dbaa322f8baca (patch)
treebe0025523d9787479605476556da5b55e9fae473 /docs/ref
parent1b6f05e91f5d1f7aaf937522ead62836ab50fed8 (diff)
Fixed #27981 -- Doc'd date/time filter l10n changes in refs #25758.
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/templates/builtins.txt25
1 files changed, 19 insertions, 6 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index c65ddc5542..166a84f2fc 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1458,12 +1458,18 @@ for example, ``"es"``, then for::
the output would be the string ``"09/01/2008"`` (the ``"SHORT_DATE_FORMAT"``
format specifier for the ``es`` locale as shipped with Django is ``"d/m/Y"``).
-When used without a format string::
+When used without a format string, the ``DATE_FORMAT`` format specifier is
+used. Assuming the same settings as the previous example::
{{ value|date }}
-...the formatting string defined in the :setting:`DATE_FORMAT` setting will be
-used, without applying any localization.
+outputs ``9 de Enero de 2008`` (the ``DATE_FORMAT`` format specifier for the
+``es`` locale is ``r'j \d\e F \d\e Y'``.
+
+.. versionchanged:: 1.10
+
+ In older versions, the :setting:`DATE_FORMAT` setting (without
+ localization) is always used when a format string isn't given.
You can combine ``date`` with the :tfilter:`time` filter to render a full
representation of a ``datetime`` value. E.g.::
@@ -2168,12 +2174,19 @@ attached timezone information (a :ref:`time-zone-aware
accept the timezone-related :ref:`format specifiers
<date-and-time-formatting-specifiers>` ``'e'``, ``'O'`` , ``'T'`` and ``'Z'``.
-When used without a format string::
+When used without a format string, the ``TIME_FORMAT`` format specifier is
+used::
{{ value|time }}
-...the formatting string defined in the :setting:`TIME_FORMAT` setting will be
-used, without applying any localization.
+is the same as::
+
+ {{ value|time:"TIME_FORMAT" }}
+
+.. versionchanged:: 1.10
+
+ In older versions, the :setting:`TIME_FORMAT` setting (without
+ localization) is always used when a format string isn't given.
.. templatefilter:: timesince