fixes #1161 - spaces in filenames should now be handled better (filename parameters are enclosed in "")
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
2bd833d462
commit
839bcfe330
|
@ -19,6 +19,6 @@ for (dirpath, dirnames, filenames) in os.walk(basedir):
|
||||||
if file.endswith('.po'):
|
if file.endswith('.po'):
|
||||||
sys.stderr.write('processing file %s in %s\n' % (file, dirpath))
|
sys.stderr.write('processing file %s in %s\n' % (file, dirpath))
|
||||||
pf = os.path.splitext(os.path.join(dirpath, file))[0]
|
pf = os.path.splitext(os.path.join(dirpath, file))[0]
|
||||||
cmd = 'msgfmt -o %s.mo %s.po' % (pf, pf)
|
cmd = 'msgfmt -o "%s.mo" "%s.po"' % (pf, pf)
|
||||||
os.system(cmd)
|
os.system(cmd)
|
||||||
|
|
||||||
|
|
|
@ -118,7 +118,7 @@ for lang in languages:
|
||||||
os.unlink(os.path.join(dirpath, thefile))
|
os.unlink(os.path.join(dirpath, thefile))
|
||||||
|
|
||||||
if os.path.exists(potfile):
|
if os.path.exists(potfile):
|
||||||
(stdin, stdout, stderr) = os.popen3('msguniq %s' % potfile, 'b')
|
(stdin, stdout, stderr) = os.popen3('msguniq "%s"' % potfile, 'b')
|
||||||
msgs = stdout.read()
|
msgs = stdout.read()
|
||||||
errors = stderr.read()
|
errors = stderr.read()
|
||||||
if errors:
|
if errors:
|
||||||
|
@ -127,7 +127,7 @@ for lang in languages:
|
||||||
sys.exit(8)
|
sys.exit(8)
|
||||||
open(potfile, 'w').write(msgs)
|
open(potfile, 'w').write(msgs)
|
||||||
if os.path.exists(pofile):
|
if os.path.exists(pofile):
|
||||||
(stdin, stdout, stderr) = os.popen3('msgmerge -q %s %s' % (pofile, potfile), 'b')
|
(stdin, stdout, stderr) = os.popen3('msgmerge -q "%s" "%s"' % (pofile, potfile), 'b')
|
||||||
msgs = stdout.read()
|
msgs = stdout.read()
|
||||||
errors = stderr.read()
|
errors = stderr.read()
|
||||||
if errors:
|
if errors:
|
||||||
|
|
Loading…
Reference in New Issue