diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-09-29 16:13:10 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2016-10-01 14:57:16 +0200 |
| commit | fa2f55cfd554c6f99653ffe0d40fd7ca74cb680e (patch) | |
| tree | 9fcc03004ae628a176dca0a98accc9ead4910021 /docs | |
| parent | 63bf615d5e5566e23ba698f95e64acfa9f2651ff (diff) | |
Refs #26940 -- Re-allowed makemessages without settings
Thanks Tim Graham for the review.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/django-admin.txt | 5 | ||||
| -rw-r--r-- | docs/releases/1.11.txt | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 74f105be74..86b5e724fa 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -564,6 +564,11 @@ directory. After making changes to the messages files you need to compile them with :djadmin:`compilemessages` for use with the builtin gettext support. See the :ref:`i18n documentation <how-to-create-language-files>` for details. +This command doesn't require configured settings. However, when settings aren't +configured, the command can't ignore the :setting:`MEDIA_ROOT` and +:setting:`STATIC_ROOT` directories or include :setting:`LOCALE_PATHS`. It will +also write files in UTF-8 rather than in :setting:`FILE_CHARSET`. + .. django-admin-option:: --all, -a Updates the message files for all available languages. diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index a9de4b095b..bc780a5031 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -515,9 +515,6 @@ Miscellaneous called a second time before calling :func:`~django.test.utils.teardown_test_environment`. -* The :djadmin:`makemessages` command now requires configured settings, like - most other commands. - * The undocumented ``DateTimeAwareJSONEncoder`` alias for :class:`~django.core.serializers.json.DjangoJSONEncoder` (renamed in Django 1.0) is removed. |