innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #14463 -- Fixed links to new location of date/time format specifiers docs. 

Thanks epicserve for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14325 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2010-10-23 14:52:01 +00:00
parent 85ef6c0938
commit f9def8b873
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/ref/settings.txt
View File

@ -447,7 +447,7 @@ Default: ``'N j, Y'`` (e.g. ``Feb. 4, 2003``)
The default formatting to use for displaying date fields in any part of the The default formatting to use for displaying date fields in any part of the
system. Note that if :setting:`USE_L10N` is set to ``True``, then the system. Note that if :setting:`USE_L10N` is set to ``True``, then the
locale-dictated format has higher precedence and will be applied instead. See locale-dictated format has higher precedence and will be applied instead. See
:ttag:`allowed date format strings <now>`. :tfilter:`allowed date format strings <date>`.
.. versionchanged:: 1.2 .. versionchanged:: 1.2
This setting can now be overriden by setting ``USE_L10N`` to ``True``. This setting can now be overriden by setting ``USE_L10N`` to ``True``.
@ -487,7 +487,7 @@ Default: ``'N j, Y, P'`` (e.g. ``Feb. 4, 2003, 4 p.m.``)
The default formatting to use for displaying datetime fields in any part of the The default formatting to use for displaying datetime fields in any part of the
system. Note that if :setting:`USE_L10N` is set to ``True``, then the system. Note that if :setting:`USE_L10N` is set to ``True``, then the
locale-dictated format has higher precedence and will be applied instead. See locale-dictated format has higher precedence and will be applied instead. See
:ttag:`allowed date format strings <now>`. :tfilter:`allowed date format strings <date>`.
.. versionchanged:: 1.2 .. versionchanged:: 1.2
This setting can now be overriden by setting ``USE_L10N`` to ``True``. This setting can now be overriden by setting ``USE_L10N`` to ``True``.
@ -1195,7 +1195,7 @@ drilldown, the header for a given day displays the day and month. Different
locales have different formats. For example, U.S. English would say locales have different formats. For example, U.S. English would say
"January 1," whereas Spanish might say "1 Enero." "January 1," whereas Spanish might say "1 Enero."
See :ttag:`allowed date format strings <now>`. See also ``DATE_FORMAT``, See :tfilter:`allowed date format strings <date>`. See also ``DATE_FORMAT``,
``DATETIME_FORMAT``, ``TIME_FORMAT`` and ``YEAR_MONTH_FORMAT``. ``DATETIME_FORMAT``, ``TIME_FORMAT`` and ``YEAR_MONTH_FORMAT``.
.. setting:: NUMBER_GROUPING .. setting:: NUMBER_GROUPING
@ -1437,7 +1437,7 @@ Default: ``m/d/Y`` (e.g. ``12/31/2003``)
An available formatting that can be used for displaying date fields on An available formatting that can be used for displaying date fields on
templates. Note that if :setting:`USE_L10N` is set to ``True``, then the templates. Note that if :setting:`USE_L10N` is set to ``True``, then the
corresponding locale-dictated format has higher precedence and will be applied. corresponding locale-dictated format has higher precedence and will be applied.
See :ttag:`allowed date format strings <now>`. See :tfilter:`allowed date format strings <date>`.
See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``. See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
@ -1453,7 +1453,7 @@ Default: ``m/d/Y P`` (e.g. ``12/31/2003 4 p.m.``)
An available formatting that can be used for displaying datetime fields on An available formatting that can be used for displaying datetime fields on
templates. Note that if :setting:`USE_L10N` is set to ``True``, then the templates. Note that if :setting:`USE_L10N` is set to ``True``, then the
corresponding locale-dictated format has higher precedence and will be applied. corresponding locale-dictated format has higher precedence and will be applied.
See :ttag:`allowed date format strings <now>`. See :tfilter:`allowed date format strings <date>`.
See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``. See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
@ -1593,7 +1593,7 @@ Default: ``'P'`` (e.g. ``4 p.m.``)
The default formatting to use for displaying time fields in any part of the The default formatting to use for displaying time fields in any part of the
system. Note that if :setting:`USE_L10N` is set to ``True``, then the system. Note that if :setting:`USE_L10N` is set to ``True``, then the
locale-dictated format has higher precedence and will be applied instead. See locale-dictated format has higher precedence and will be applied instead. See
:ttag:`allowed date format strings <now>`. :tfilter:`allowed date format strings <date>`.
.. versionchanged:: 1.2 .. versionchanged:: 1.2
This setting can now be overriden by setting ``USE_L10N`` to ``True``. This setting can now be overriden by setting ``USE_L10N`` to ``True``.
@ -1747,7 +1747,7 @@ drilldown, the header for a given month displays the month and the year.
Different locales have different formats. For example, U.S. English would say Different locales have different formats. For example, U.S. English would say
"January 2006," whereas another locale might say "2006/January." "January 2006," whereas another locale might say "2006/January."
See :ttag:`allowed date format strings <now>`. See also ``DATE_FORMAT``, See :tfilter:`allowed date format strings <date>`. See also ``DATE_FORMAT``,
``DATETIME_FORMAT``, ``TIME_FORMAT`` and ``MONTH_DAY_FORMAT``. ``DATETIME_FORMAT``, ``TIME_FORMAT`` and ``MONTH_DAY_FORMAT``.
Deprecated settings Deprecated settings