p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[2.0.x] Fixed #28403 -- Added missing formats in FORMAT_MODULE_PATH docs. 

Backport of 95fd5cf459 from master
This commit is contained in:
Ashaba 2017-11-30 11:12:20 +03:00 committed by Tim Graham
parent f02c44396a
commit c6c73e3401
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docs/ref/settings.txt
View File

@ -1600,8 +1600,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.
@ -1628,12 +1628,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

4
docs/topics/i18n/translation.txt
View File

@ -2072,6 +2072,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.