summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-02-16 12:15:04 +0000
committerJannis Leidel <jannis@leidel.info>2010-02-16 12:15:04 +0000
commiteb26c9686bc1f9b9b5bcd10e861fc7d055845209 (patch)
tree650e90f9a76dfdcdb782ca20f8c0d003703d76f3 /docs
parentfef575a7f927fd2b080abee63a600d333c26e52d (diff)
Fixed #7050 - Allow the makemessages command to optionally ignore paths when examining source code and templates for translation strings.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12444 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/man/django-admin.19
-rw-r--r--docs/ref/django-admin.txt18
2 files changed, 26 insertions, 1 deletions
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 473809279b..ce3fdb1675 100644
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
@@ -46,7 +46,7 @@ Executes
.B sqlall
for the given app(s) in the current database.
.TP
-.BI "makemessages [" "\-\-locale=LOCALE" "] [" "\-\-domain=DOMAIN" "] [" "\-\-extension=EXTENSION" "] [" "\-\-all" "] [" "\-\-symlinks" "]"
+.BI "makemessages [" "\-\-locale=LOCALE" "] [" "\-\-domain=DOMAIN" "] [" "\-\-extension=EXTENSION" "] [" "\-\-all" "] [" "\-\-symlinks" "] [" "\-\-ignore=PATTERN" "] [" "\-\-no\-default\-ignore" "]"
Runs over the entire source tree of the current directory and pulls out all
strings marked for translation. It creates (or updates) a message file in the
conf/locale (in the django tree) or locale (for project and application) directory.
@@ -159,6 +159,13 @@ extensions with commas, or use -e multiple times).
Follows symlinks to directories when examining source code and templates for
translation strings.
.TP
+.I \-e, \-\-ignore=PATTERN
+Ignore files or directories matching this glob-style pattern. Use multiple
+times to ignore more.
+.TP
+.I \-e, \-\-no\-default\-ignore
+Don't ignore the common private glob-style patterns 'CVS', '.*' and '*~'.
+.TP
.I \-a, \-\-all
Process all available locales when using makemessages..SH "ENVIRONMENT"
.TP
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 641e619fa6..1d02d56507 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -483,6 +483,24 @@ Example usage::
django-admin.py makemessages --locale=de --symlinks
+.. django-admin-option:: --ignore
+
+Use the ``--ignore`` or ``-i`` option to ignore files or directories matching
+the given `glob-style pattern`_. Use multiple times to ignore more.
+
+These patterns are used by default: ``'CVS'``, ``'.*'``, ``'*~'``
+
+Example usage::
+
+ django-admin.py makemessages --locale=en_US --ignore=apps/* --ignore=secret/*.html
+
+.. _`glob-style pattern`: http://docs.python.org/library/glob.html
+
+.. django-admin-option:: --no-default-ignore
+
+Use the ``--no-default-ignore`` option to disable the default values of
+:djadminopt:`--ignore`.
+
reset <appname appname ...>
---------------------------