mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-24 21:54:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed clash caused by the newly introduced -e shorthand for makemessages --exclude.

Browse source 
This fixes a regression caused by 0707b82. Refs #22328.
This commit is contained in:
Loic Bistuer 2014-05-01 14:03:24 +07:00
parent 0dce44e16b
commit d1799233f4
6 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/man/django-admin.1
View file

@ -176,7 +176,7 @@ output a full stack trace whenever an exception is raised.
.I \-l, \-\-locale=LOCALE
The locale to process when using makemessages or compilemessages.
.TP
.I \-e, \-\-exclude=LOCALE
.I \-x, \-\-exclude=LOCALE
The locale to exclude from processing when using makemessages or compilemessages.
.TP
.I \-d, \-\-domain=DOMAIN

12
docs/ref/django-admin.txt
View file

@ -143,7 +143,7 @@ specify the locale(s) to process. If not provided, all locales are processed.
.. versionadded:: 1.8
Use the :djadminopt:`--exclude` option (or its shorter version ``-e``) to
Use the :djadminopt:`--exclude` option (or its shorter version ``-x``) to
specify the locale(s) to exclude from processing. If not provided, no locales
are excluded.
@ -155,8 +155,8 @@ Example usage::
django-admin.py compilemessages -l pt_BR -l fr
django-admin.py compilemessages --exclude=pt_BR
django-admin.py compilemessages --exclude=pt_BR --exclude=fr
django-admin.py compilemessages -e pt_BR
django-admin.py compilemessages -e pt_BR -e fr
django-admin.py compilemessages -x pt_BR
django-admin.py compilemessages -x pt_BR -x fr
createcachetable
----------------
@ -563,7 +563,7 @@ specify the locale(s) to process.
.. versionadded:: 1.8
Use the :djadminopt:`--exclude` option (or its shorter version ``-e``) to
Use the :djadminopt:`--exclude` option (or its shorter version ``-x``) to
specify the locale(s) to exclude from processing. If not provided, no locales
are excluded.
@ -575,8 +575,8 @@ Example usage::
django-admin.py makemessages -l pt_BR -l fr
django-admin.py makemessages --exclude=pt_BR
django-admin.py makemessages --exclude=pt_BR --exclude=fr
django-admin.py makemessages -e pt_BR
django-admin.py makemessages -e pt_BR -e fr
django-admin.py makemessages -x pt_BR
django-admin.py makemessages -x pt_BR -x fr
.. versionchanged:: 1.7