summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-11-04 12:08:37 +0000
committerJannis Leidel <jannis@leidel.info>2010-11-04 12:08:37 +0000
commitefc5384a325e8621cac37b2a33ce64e609c66f39 (patch)
tree31e9363f00a0a01fdf27e5da5dc77a775157d89a /docs
parentc906b270f5bc53d9657c5f0bdb98a3015c9f8c71 (diff)
Fixed #6476 -- Added option to makemessages management command to disable wrapping of long lines. Thanks to pytechd for the initial patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14454 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/man/django-admin.15
-rw-r--r--docs/ref/django-admin.txt7
2 files changed, 11 insertions, 1 deletions
diff --git a/docs/man/django-admin.1 b/docs/man/django-admin.1
index 016c80f78f..a402bab65a 100644
--- a/docs/man/django-admin.1
+++ b/docs/man/django-admin.1
@@ -60,7 +60,7 @@ Executes
.B sqlall
for the given app(s) in the current database.
.TP
-.BI "makemessages [" "\-\-locale=LOCALE" "] [" "\-\-domain=DOMAIN" "] [" "\-\-extension=EXTENSION" "] [" "\-\-all" "] [" "\-\-symlinks" "] [" "\-\-ignore=PATTERN" "] [" "\-\-no\-default\-ignore" "]"
+.BI "makemessages [" "\-\-locale=LOCALE" "] [" "\-\-domain=DOMAIN" "] [" "\-\-extension=EXTENSION" "] [" "\-\-all" "] [" "\-\-symlinks" "] [" "\-\-ignore=PATTERN" "] [" "\-\-no\-default\-ignore" "] [" "\-\-no\-wrap" "]"
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.
@@ -196,6 +196,9 @@ times to ignore more.
.I \-\-no\-default\-ignore
Don't ignore the common private glob-style patterns 'CVS', '.*' and '*~'.
.TP
+.I \-\-no\-wrap
+Don't break long message lines into several lines.
+.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 ae4b283622..ea49e2372d 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -481,6 +481,13 @@ Example usage::
Use the ``--no-default-ignore`` option to disable the default values of
:djadminopt:`--ignore`.
+.. django-admin-option:: --no-wrap
+
+.. versionadded:: 1.3
+
+Use the ``--no-wrap`` option to disable breaking long message lines into
+several lines in language files.
+
reset <appname appname ...>
---------------------------