From efc5384a325e8621cac37b2a33ce64e609c66f39 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Thu, 4 Nov 2010 12:08:37 +0000 Subject: 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 --- docs/man/django-admin.1 | 5 ++++- docs/ref/django-admin.txt | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'docs') 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 --------------------------- -- cgit v1.3