summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 16:35:35 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 16:35:35 +0000
commitd073efa0bb5cf7bb2fe8e76bbd2c94fb6b97c816 (patch)
tree18f1b3df2d51e7aed3d8c022455b2c701cea8852
parentb3b541b68ea83164aee967539e4aa44cbdb88b6e (diff)
[1.0.X]: Fixed #10375 -- Added documentation about the default format strings used for the `date` and `time` filters when no format string is passed to the filter, based on patch from kgrandis.
Backport of r10259 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10260 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/ref/templates/builtins.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index b74723c28f..b0022a77ff 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -837,6 +837,13 @@ If ``value`` is a ``datetime`` object (e.g., the result of
``datetime.datetime.now()``), the output will be the string
``'Wed 09 Jan 2008'``.
+When used without a format string::
+
+ {{ value|date }}
+
+...the formatting string defined in the :setting:`DATE_FORMAT` setting will be
+used.
+
.. templatefilter:: default
default
@@ -1380,6 +1387,13 @@ For example::
If ``value`` is equivalent to ``datetime.datetime.now()``, the output will be
the string ``"01:23"``.
+When used without a format string::
+
+ {{ value|time }}
+
+...the formatting string defined in the :setting:`TIME_FORMAT` setting will be
+used.
+
.. templatefilter:: timesince
timesince