summaryrefslogtreecommitdiff
path: root/docs/ref/templates
diff options
context:
space:
mode:
authorGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 16:34:24 +0000
committerGary Wilson Jr <gary.wilson@gmail.com>2009-03-31 16:34:24 +0000
commitd8bffb39697e08e2eda79bbf4de2cd02b42acfa4 (patch)
tree3d1adb44619b120826fc6c2c4a98f1e722886abc /docs/ref/templates
parentc823e9d7ccba303fb37ce232eb1db901ef580a2a (diff)
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10259 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/templates')
-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 17e6e8bf9e..71ac2b19d1 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -866,6 +866,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
@@ -1424,6 +1431,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