From ce27fb198dcce5dad47de83fc81119d3bb6567ce Mon Sep 17 00:00:00 2001 From: Ramiro Morales Date: Fri, 25 Jan 2013 13:58:37 -0300 Subject: Revert "Patch by Claude for #16084." This reverts commit 2babab0bb351ff7a13fd23795f5e926a9bf95d22. --- docs/man/django-admin.1 | 3 +-- docs/ref/django-admin.txt | 4 ++-- docs/topics/i18n/translation.txt | 17 ++++++++++++++++- 3 files changed, 19 insertions(+), 5 deletions(-) (limited to 'docs') diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1 index c9c8d19869..4d937b488b 100644 --- a/docs/man/django-admin.1 +++ b/docs/man/django-admin.1 @@ -193,8 +193,7 @@ Ignore files or directories matching this glob-style pattern. Use multiple times to ignore more (makemessages command). .TP .I \-\-no\-default\-ignore -Don't ignore the common private glob-style patterns 'CVS', '.*', '*~' and '*.pyc' -(makemessages command). +Don't ignore the common private glob-style patterns 'CVS', '.*' and '*~' (makemessages command). .TP .I \-\-no\-wrap Don't break long message lines into several lines (makemessages command). diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index f7b91bbdab..8f6664edb7 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -472,7 +472,7 @@ Example usage:: Use the ``--ignore`` or ``-i`` option to ignore files or directories matching the given :mod:`glob`-style pattern. Use multiple times to ignore more. -These patterns are used by default: ``'CVS'``, ``'.*'``, ``'*~'``, ``'*.pyc'`` +These patterns are used by default: ``'CVS'``, ``'.*'``, ``'*~'`` Example usage:: @@ -499,7 +499,7 @@ for technically skilled translators to understand each message's context. .. versionadded:: 1.6 Use the ``--keep-pot`` option to prevent django from deleting the temporary -.pot files it generates before creating the .po file. This is useful for +.pot file it generates before creating the .po file. This is useful for debugging errors which may prevent the final language files from being created. runfcgi [options] diff --git a/docs/topics/i18n/translation.txt b/docs/topics/i18n/translation.txt index 8ef51e4052..01f168bc10 100644 --- a/docs/topics/i18n/translation.txt +++ b/docs/topics/i18n/translation.txt @@ -1543,9 +1543,24 @@ All message file repositories are structured the same way. They are: * ``$PYTHONPATH/django/conf/locale//LC_MESSAGES/django.(po|mo)`` To create message files, you use the :djadmin:`django-admin.py makemessages ` -tool. And you use :djadmin:`django-admin.py compilemessages ` +tool. You only need to be in the same directory where the ``locale/`` directory +is located. And you use :djadmin:`django-admin.py compilemessages ` to produce the binary ``.mo`` files that are used by ``gettext``. You can also run :djadmin:`django-admin.py compilemessages --settings=path.to.settings ` to make the compiler process all the directories in your :setting:`LOCALE_PATHS` setting. + +Finally, you should give some thought to the structure of your translation +files. If your applications need to be delivered to other users and will be used +in other projects, you might want to use app-specific translations. But using +app-specific translations and project-specific translations could produce weird +problems with :djadmin:`makemessages`: it will traverse all directories below +the current path and so might put message IDs into a unified, common message +file for the current project that are already in application message files. + +The easiest way out is to store applications that are not part of the project +(and so carry their own translations) outside the project tree. That way, +:djadmin:`django-admin.py makemessages `, when ran on a project +level will only extract strings that are connected to your explicit project and +not strings that are distributed independently. -- cgit v1.3