Author: julien
Date: 2011-09-21 10:25:13 -0700 (Wed, 21 Sep 2011)
New Revision: 16864
Modified:
django/trunk/django/core/management/commands/makemessages.py
Log:
Fixed #16897 -- Fixed some docstrings and help texts for the `makemessages`
management command. Thanks, Simon Meers.
Modified: django/trunk/django/core/management/commands/makemessages.py
===================================================================
--- django/trunk/django/core/management/commands/makemessages.py
2011-09-21 15:58:32 UTC (rev 16863)
+++ django/trunk/django/core/management/commands/makemessages.py
2011-09-21 17:25:13 UTC (rev 16864)
@@ -15,16 +15,19 @@
def handle_extensions(extensions=('html',)):
"""
- organizes multiple extensions that are separated with commas or passed by
- using --extension/-e multiple times.
+ Organizes multiple extensions that are separated with commas or passed by
+ using --extension/-e multiple times. Note that the .py extension is ignored
+ here because of the way non-*.py files are handled in make_messages() (they
+ are copied to file.ext.py files to trick xgettext to parse them as Python
+ files).
- for example: running 'django-admin makemessages -e js,txt -e xhtml -a'
- would result in a extension list: ['.js', '.txt', '.xhtml']
+ For example: running 'django-admin makemessages -e js,txt -e xhtml -a'
+ would result in an extension list: ['.js', '.txt', '.xhtml']
>>> handle_extensions(['.html', 'html,js,py,py,py,.py', 'py,.py'])
- ['.html', '.js']
+ set(['.html', '.js'])
>>> handle_extensions(['.html, txt,.tpl'])
- ['.html', '.tpl', '.txt']
+ set(['.html', '.tpl', '.txt'])
"""
ext_list = []
for ext in extensions:
@@ -32,10 +35,6 @@
for i, ext in enumerate(ext_list):
if not ext.startswith('.'):
ext_list[i] = '.%s' % ext_list[i]
-
- # we don't want *.py files here because of the way non-*.py files
- # are handled in make_messages() (they are copied to file.ext.py files to
- # trick xgettext to parse them as Python files)
return set([x for x in ext_list if x != '.py'])
def _popen(cmd):
@@ -318,7 +317,7 @@
make_option('--all', '-a', action='store_true', dest='all',
default=False, help='Updates the message files for all existing
locales.'),
make_option('--extension', '-e', dest='extensions',
- help='The file extension(s) to examine (default: ".html", separate
multiple extensions with commas, or use -e multiple times)',
+ help='The file extension(s) to examine (default: "html,txt", or
"js" if the domain is "djangojs"). Separate multiple extensions with commas, or
use -e multiple times.',
action='append'),
make_option('--symlinks', '-s', action='store_true', dest='symlinks',
default=False, help='Follows symlinks to directories when
examining source code and templates for translation strings.'),
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
