Fixed #10234 -- Improved error message when internationalizing templates.
Patch from peterbe and Andrew Badr. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10538 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
cc10f50c19
commit
794f2d121e
|
@ -145,7 +145,11 @@ def make_messages(locale=None, domain='django', verbosity='1', all=False, extens
|
||||||
if file_ext in extensions:
|
if file_ext in extensions:
|
||||||
src = open(os.path.join(dirpath, file), "rU").read()
|
src = open(os.path.join(dirpath, file), "rU").read()
|
||||||
thefile = '%s.py' % file
|
thefile = '%s.py' % file
|
||||||
|
try:
|
||||||
open(os.path.join(dirpath, thefile), "w").write(templatize(src))
|
open(os.path.join(dirpath, thefile), "w").write(templatize(src))
|
||||||
|
except SyntaxError, msg:
|
||||||
|
msg = "%s (file: %s)" % (msg, os.path.join(dirpath, file))
|
||||||
|
raise SyntaxError(msg)
|
||||||
if verbosity > 1:
|
if verbosity > 1:
|
||||||
sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
|
sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
|
||||||
cmd = 'xgettext -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
|
cmd = 'xgettext -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
|
||||||
|
|
Loading…
Reference in New Issue