Ticket #15918: 15918.2.patch
| File 15918.2.patch, 3.1 KB (added by , 14 years ago) |
|---|
-
docs/ref/settings.txt
716 716 717 717 Default decimal separator used when formatting decimal numbers. 718 718 719 Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated 720 format has higher precedence and will be applied instead. 721 722 See also :setting:`NUMBER_GROUPING`, :setting:`THOUSAND_SEPARATOR` and 723 :setting:`USE_THOUSAND_SEPARATOR`. 724 725 719 726 .. setting:: DEFAULT_CHARSET 720 727 721 728 DEFAULT_CHARSET … … 1349 1356 1350 1357 Default: ``0`` 1351 1358 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. 1359 Number of digits grouped together on the integer part of a number. 1357 1360 1358 See also :setting:`THOUSAND_SEPARATOR` and :setting:`USE_THOUSAND_SEPARATOR`. 1361 Common use is to display a thousand separator. If this setting is ``0``, then 1362 no 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 1364 those groups. 1359 1365 1366 Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated 1367 format has higher precedence and will be applied instead. 1368 1369 See also :setting:`DECIMAL_SEPARATOR`, :setting:`THOUSAND_SEPARATOR` and 1370 :setting:`USE_THOUSAND_SEPARATOR`. 1371 1360 1372 .. setting:: PASSWORD_RESET_TIMEOUT_DAYS 1361 1373 1362 1374 PASSWORD_RESET_TIMEOUT_DAYS … … 1794 1806 1795 1807 .. versionadded:: 1.2 1796 1808 1797 Default ``,`` (Comma)1809 Default: ``,`` (Comma) 1798 1810 1799 1811 Default thousand separator used when formatting numbers. This setting is 1800 used only when ``NUMBER_GROUPING`` and ``USE_THOUSAND_SEPARATOR`` are set. 1812 used only when :setting:`USE_THOUSAND_SEPARATOR` is ``True`` and 1813 :setting:`NUMBER_GROUPING` is greater than ``0``. 1801 1814 1802 See also :setting:`NUMBER_GROUPING`, :setting:`DECIMAL_SEPARATOR` and 1815 Note that if :setting:`USE_I18N` is set to ``True``, then the locale-dictated 1816 format has higher precedence and will be applied instead. 1817 1818 See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and 1803 1819 :setting:`USE_THOUSAND_SEPARATOR`. 1804 1820 1805 1821 .. setting:: TIME_FORMAT … … 1944 1960 1945 1961 Default ``False`` 1946 1962 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. 1963 A boolean that specifies whether to display numbers using a thousand separator. 1951 1964 1952 See also ``THOUSAND_SEPARATOR`` and ``NUMBER_GROUPING``. 1965 When :setting:`USE_L10N` is set to ``True``, if this is also set to ``True``, 1966 Django will use the values of :setting:`THOUSAND_SEPARATOR` and 1967 :setting:`NUMBER_GROUPING` to format numbers. 1953 1968 1969 See also :setting:`DECIMAL_SEPARATOR`, :setting:`NUMBER_GROUPING` and 1970 :setting:`THOUSAND_SEPARATOR`. 1971 1954 1972 .. setting:: YEAR_MONTH_FORMAT 1955 1973 1956 1974 YEAR_MONTH_FORMAT