浏览代码

Fixed #27981 -- Doc'd date/time filter l10n changes in refs #25758.

Claude Paroz 8 年之前
父节点
当前提交
6585ebebaa
共有 2 个文件被更改,包括 24 次插入6 次删除
  1. 19 6
      docs/ref/templates/builtins.txt
  2. 5 0
      docs/releases/1.10.txt

+ 19 - 6
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
 

+ 5 - 0
docs/releases/1.10.txt

@@ -919,6 +919,11 @@ Miscellaneous
   To adapt, move the fragment outside the template tag:
   ``{% static 'img.svg' %}#fragment``.
 
+* When :setting:`USE_L10N` is ``True``, localization is now applied for the
+  :tfilter:`date` and :tfilter:`time` filters when no format string is
+  specified. The ``DATE_FORMAT`` and ``TIME_FORMAT`` specifiers from the active
+  locale are used instead of the settings of the same name.
+
 .. _deprecated-features-1.10:
 
 Features deprecated in 1.10