diff options
| author | Ashaba <jnashaba4@gmail.com> | 2017-11-30 11:12:20 +0300 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-01-24 13:38:15 -0500 |
| commit | 95fd5cf459dd23d18e9ef8e1a03eb820fe7205ce (patch) | |
| tree | f5b9e7dcfd9846a9ec4eca8f04561f8d20423c48 /docs | |
| parent | d38a3169a426516623929ff8c2b2c9703d801b75 (diff) | |
Fixed #28403 -- Added missing formats in FORMAT_MODULE_PATH docs.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 26 | ||||
| -rw-r--r-- | docs/topics/i18n/translation.txt | 4 |
2 files changed, 22 insertions, 8 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 236cf8c05b..152c6e339c 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1577,8 +1577,8 @@ render API <low-level-widget-render-api>`. Default: ``None`` -A full Python path to a Python package that contains format definitions for -project locales. If not ``None``, Django will check for a ``formats.py`` +A full Python path to a Python package that contains custom format definitions +for project locales. If not ``None``, Django will check for a ``formats.py`` file, under the directory named as the current locale, and will use the formats defined in this file. @@ -1605,12 +1605,22 @@ paths until it finds a module that actually defines the given format. This means that formats defined in packages farther up in the list will take precedence over the same formats in packages farther down. -Available formats are :setting:`DATE_FORMAT`, :setting:`TIME_FORMAT`, -:setting:`DATETIME_FORMAT`, :setting:`YEAR_MONTH_FORMAT`, -:setting:`MONTH_DAY_FORMAT`, :setting:`SHORT_DATE_FORMAT`, -:setting:`SHORT_DATETIME_FORMAT`, :setting:`FIRST_DAY_OF_WEEK`, -:setting:`DECIMAL_SEPARATOR`, :setting:`THOUSAND_SEPARATOR` and -:setting:`NUMBER_GROUPING`. +Available formats are: + +* :setting:`DATE_FORMAT` +* :setting:`DATE_INPUT_FORMATS` +* :setting:`DATETIME_FORMAT`, +* :setting:`DATETIME_INPUT_FORMATS` +* :setting:`DECIMAL_SEPARATOR` +* :setting:`FIRST_DAY_OF_WEEK` +* :setting:`MONTH_DAY_FORMAT` +* :setting:`NUMBER_GROUPING` +* :setting:`SHORT_DATE_FORMAT` +* :setting:`SHORT_DATETIME_FORMAT` +* :setting:`THOUSAND_SEPARATOR` +* :setting:`TIME_FORMAT` +* :setting:`TIME_INPUT_FORMATS` +* :setting:`YEAR_MONTH_FORMAT` .. setting:: IGNORABLE_404_URLS diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 5003bfb997..6f890dbbaa 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -2076,6 +2076,10 @@ translations for the same literal: following a similar but not identical algorithm. See :class:`.JavaScriptCatalog` for more details. + You can also put :ref:`custom format files <custom-format-files>` in the + :setting:`LOCALE_PATHS` directories if you also set + :setting:`FORMAT_MODULE_PATH`. + In all cases the name of the directory containing the translation is expected to be named using :term:`locale name` notation. E.g. ``de``, ``pt_BR``, ``es_AR``, etc. |