Code

Ticket #15918: 15918.2.patch

File 15918.2.patch, 3.1 KB (added by aaugustin, 3 years ago)
  • docs/ref/settings.txt

     
    716716 
    717717Default decimal separator used when formatting decimal numbers. 
    718718 
     719Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated 
     720format has higher precedence and will be applied instead. 
     721 
     722See also :setting:`NUMBER_GROUPING`, :setting:`THOUSAND_SEPARATOR` and 
     723:setting:`USE_THOUSAND_SEPARATOR`. 
     724 
     725 
    719726.. setting:: DEFAULT_CHARSET 
    720727 
    721728DEFAULT_CHARSET 
     
    13491356 
    13501357Default: ``0`` 
    13511358 
    1352 Number of digits grouped together on the integer part of a number. Common use 
    1353 is to display a thousand separator. If this setting is ``0``, then, no grouping 
    1354 will be applied to the number. If this setting is greater than ``0`` then the 
    1355 setting :setting:`THOUSAND_SEPARATOR` will be used as the separator between those 
    1356 groups. 
     1359Number of digits grouped together on the integer part of a number. 
    13571360 
    1358 See also :setting:`THOUSAND_SEPARATOR` and :setting:`USE_THOUSAND_SEPARATOR`. 
     1361Common use is to display a thousand separator. If this setting is ``0``, then 
     1362no grouping will be applied to the number. If this setting is greater than 
     1363``0``, then :setting:`THOUSAND_SEPARATOR` will be used as the separator between 
     1364those groups. 
    13591365 
     1366Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated 
     1367format has higher precedence and will be applied instead. 
     1368 
     1369See also :setting:`DECIMAL_SEPARATOR`, :setting:`THOUSAND_SEPARATOR` and 
     1370:setting:`USE_THOUSAND_SEPARATOR`. 
     1371 
    13601372.. setting:: PASSWORD_RESET_TIMEOUT_DAYS 
    13611373 
    13621374PASSWORD_RESET_TIMEOUT_DAYS 
     
    17941806 
    17951807.. versionadded:: 1.2 
    17961808 
    1797 Default ``,`` (Comma) 
     1809Default: ``,`` (Comma) 
    17981810 
    17991811Default thousand separator used when formatting numbers. This setting is 
    1800 used only when ``NUMBER_GROUPING`` and ``USE_THOUSAND_SEPARATOR`` are set. 
     1812used only when :setting:`USE_THOUSAND_SEPARATOR` is ``True`` and 
     1813:setting:`NUMBER_GROUPING` is greater than ``0``. 
    18011814 
    1802 See also :setting:`NUMBER_GROUPING`, :setting:`DECIMAL_SEPARATOR` and 
     1815Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated 
     1816format has higher precedence and will be applied instead. 
     1817 
     1818See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and 
    18031819:setting:`USE_THOUSAND_SEPARATOR`. 
    18041820 
    18051821.. setting:: TIME_FORMAT 
     
    19441960 
    19451961Default ``False`` 
    19461962 
    1947 A boolean that specifies wheter to display numbers using a thousand separator. 
    1948 If this is set to ``True``, Django will use values from ``THOUSAND_SEPARATOR`` 
    1949 and ``NUMBER_GROUPING`` from current locale, to format the number. 
    1950 ``USE_L10N`` must be set to ``True``, in order to format numbers. 
     1963A boolean that specifies whether to display numbers using a thousand separator. 
    19511964 
    1952 See also ``THOUSAND_SEPARATOR`` and ``NUMBER_GROUPING``. 
     1965When :setting:`USE_L10N` is set to ``True``, if this is also set to ``True``, 
     1966Django will use the values of :setting:`THOUSAND_SEPARATOR` and 
     1967:setting:`NUMBER_GROUPING` to format numbers. 
    19531968 
     1969See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and 
     1970:setting:`THOUSAND_SEPARATOR`. 
     1971 
    19541972.. setting:: YEAR_MONTH_FORMAT 
    19551973 
    19561974YEAR_MONTH_FORMAT