Ticket #12967: 12967.2.diff

docs/ref/settings.txt

@@ -203 +203 @@
 DATABASES
 ---------
 
-.. versionadded: 1.2
+.. versionadded:: 1.2
 
 Default: ``{}`` (Empty dictionary)
 
@@ -393 +393 @@
 DATABASE_ROUTERS
 ----------------
 
-.. versionadded: 1.2
+.. versionadded:: 1.2
 
 Default: ``[]`` (Empty list)
 
@@ -410 +410 @@
 
 Default: ``'N j, Y'`` (e.g. ``Feb. 4, 2003``)
 
-The default formatting to use for date fields in any part of the system.
-Note that if ``USE_L10N`` is set to ``True``, then locale format will
-be applied. See :ttag:`allowed date format strings <now>`.
+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
+locale-dictated format has higher precedence and will be applied instead. See
+:ttag:`allowed date format strings <now>`.
+
+.. versionchanged:: 1.2
+    This setting can now be overriden by setting ``USE_L10N`` to ``True``.
 
 See also ``DATETIME_FORMAT``, ``TIME_FORMAT`` and ``SHORT_DATE_FORMAT``.
 
@@ -421 +425 @@
 DATE_INPUT_FORMATS
 ------------------
 
+.. versionadded:: 1.2
+
 Default::
 
     ('%Y-%m-%d', '%m/%d/%Y', '%m/%d/%y', '%b %d %Y',
@@ -444 +450 @@
 
 Default: ``'N j, Y, P'`` (e.g. ``Feb. 4, 2003, 4 p.m.``)
 
-The default formatting to use for datetime fields in any part of the system.
-Note that if ``USE_L10N`` is set to ``True``, then locale format will
-be applied. See :ttag:`allowed date format strings <now>`.
+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
+locale-dictated format has higher precedence and will be applied instead. See
+:ttag:`allowed date format strings <now>`.
+
+.. versionchanged:: 1.2
+    This setting can now be overriden by setting ``USE_L10N`` to ``True``.
 
 See also ``DATE_FORMAT``, ``TIME_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
 
@@ -455 +465 @@
 DATETIME_INPUT_FORMATS
 ----------------------
 
+.. versionadded:: 1.2
+
 Default::
 
     ('%Y-%m-%d %H:%M:%S', '%Y-%m-%d %H:%M', '%Y-%m-%d',
@@ -514 +526 @@
 DECIMAL_SEPARATOR
 -----------------
 
+.. versionadded:: 1.2
+
 Default: ``'.'`` (Dot)
 
 Default decimal separator used when formatting decimal numbers.
@@ -771 +785 @@
 FIRST_DAY_OF_WEEK
 -----------------
 
+.. versionadded:: 1.2
+
 Default: ``0`` (Sunday)
 
 Number representing the first day of the week. This is especially useful
@@ -807 +823 @@
 FORMAT_MODULE_PATH
 ------------------
 
+.. versionadded:: 1.2
+
 Default: ``None``
 
 A full Python path to a Python package that contains format definitions for
@@ -1106 +1124 @@
 NUMBER_GROUPING
 ----------------
 
+.. versionadded:: 1.2
+
 Default: ``0``
 
 Number of digits grouped together on the integer part of a number. Common use
@@ -1328 +1348 @@
 SHORT_DATE_FORMAT
 -----------------
 
+.. versionadded:: 1.2
+
 Default: ``m/d/Y`` (e.g. ``12/31/2003``)
 
-An available formatting that can be used for date fields on templates.
-Note that if ``USE_L10N`` is set to ``True``, then locale format will
-be applied. See :ttag:`allowed date format strings <now>`.
+An available formatting that can be used for displaying date fields on
+templates.  Note that if ``USE_L10N`` is set to ``True``, then the corresponding
+locale-dictated format has higher precedence and will be applied. See
+:ttag:`allowed date format strings <now>`.
 
 See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
 
@@ -1341 +1364 @@
 SHORT_DATETIME_FORMAT
 ---------------------
 
+.. versionadded:: 1.2
+
 Default: ``m/d/Y P`` (e.g. ``12/31/2003 4 p.m.``)
 
-An available formatting that can be used for datetime fields on templates.
-Note that if ``USE_L10N`` is set to ``True``, then locale format will
-be applied. See :ttag:`allowed date format strings <now>`.
+An available formatting that can be used for displaying datetime fields on
+templates.  Note that if ``USE_L10N`` is set to ``True``, then the corresponding
+locale-dictated format has higher precedence and will be applied. See
+:ttag:`allowed date format strings <now>`.
 
 See also ``DATE_FORMAT`` and ``SHORT_DATETIME_FORMAT``.
 
@@ -1461 +1487 @@
 THOUSAND_SEPARATOR
 ------------------
 
+.. versionadded:: 1.2
+
 Default ``,`` (Comma)
 
 Default thousand separator used when formatting numbers. This setting is
@@ -1475 +1503 @@
 
 Default: ``'P'`` (e.g. ``4 p.m.``)
 
-The default formatting to use for time fields in any part of the system.
-Note that if ``USE_L10N`` is set to ``True``, then locale format will
-be applied. See :ttag:`allowed date format strings <now>`.
+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
+locale-dictated format has higher precedence and will be applied instead. See
+:ttag:`allowed date format strings <now>`.
+
+.. versionchanged:: 1.2
+    This setting can now be overriden by setting ``USE_L10N`` to ``True``.
 
 See also ``DATE_FORMAT`` and ``DATETIME_FORMAT``.
 
@@ -1486 +1518 @@
 TIME_INPUT_FORMATS
 ------------------
 
+.. versionadded:: 1.2
+
 Default: ``('%H:%M:%S', '%H:%M')``
 
 A tuple of formats that will be accepted when inputting data on a time
@@ -1556 +1590 @@
 USE_L10N
 --------
 
+.. versionadded:: 1.2
+
 Default ``False``
 
 A boolean that specifies if data will be localized by default or not. If this
@@ -1583 +1619 @@
 USE_THOUSAND_SEPARATOR
 ----------------------
 
+.. versionadded:: 1.2
+
 Default ``False``
 
 A boolean that specifies wheter to display numbers using a thousand separator.

docs/ref/templates/builtins.txt

@@ -1010 +1010 @@
 
 If ``value`` is ``4``, then the output will be ``6``.
 
-.. versionchanged:: 1.2 
+.. versionchanged:: 1.2
    The following behavior didn't exist in previous Django versions.
 
 This filter will first try to coerce both values to integers. If this fails,
@@ -1026 +1026 @@
 output will be ``[1, 2, 3, 4, 5, 6]``.
 
 .. warning::
-    
+
     Keep in mind that strings that can both be coerced to integers will be,
     and thus will be will be *summed*, not concatenated, as in the first
     example above.
@@ -1103 +1103 @@
 ``datetime.datetime.now()``), the output will be the string
 ``'Wed 09 Jan 2008'``.
 
+Another example:
+
+Assuming that :setting:`USE_L10N` is ``True`` and :setting:`LANGUAGE_CODE` is,
+for example, ``"es"``, then for::
+
+    {{ value|date:"SHORT_DATE_FORMAT" }}
+
+the output will 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::
 
     {{ value|date }}
@@ -1110 +1120 @@
 ...the formatting string defined in the :setting:`DATE_FORMAT` setting will be
 used, without applying any localization.
 
+.. versionchanged:: 1.2
+    Predefined formats can now be influenced by the current locale.
+
 .. templatefilter:: default
 
 default
@@ -1730 +1743 @@
 If ``value`` is equivalent to ``datetime.datetime.now()``, the output will be
 the string ``"01:23"``.
 
+Another example:
+
+Assuming that :setting:`USE_L10N` is ``True`` and :setting:`LANGUAGE_CODE` is,
+for example, ``"de"``, then for::
+
+    {{ value|time:"TIME_FORMAT" }}
+
+the output will be the string ``"01:23:00"`` (The ``"TIME_FORMAT"`` format
+specifier for the ``de`` locale as shipped with Django is ``"H:i:s"``).
+
 When used without a format string::
 
     {{ value|time }}
 
 ...the formatting string defined in the :setting:`TIME_FORMAT` setting will be
-used, without aplying any localization.
+used, without applying any localization.
+
+.. versionchanged:: 1.2
+    Predefined formats can now be influenced by the current locale.
 
 .. templatefilter:: timesince
 

docs/topics/i18n/localization.txt

@@ -247 +247 @@
 Format localization
 ===================
 
+.. versionadded:: 1.2
+
 Django's formatting system is disabled by default. To enable it, it's necessary
 to set :setting:`USE_L10N = True <USE_L10N>` in your settings file.