Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #4899 -- Fixed a problem on Windows when generating message cat…

…alogs (caused by [5722]). Thanks, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8b128dddd14791b18f37a142e3c428fe08a42908 1 parent 1e6ff90
@malcolmt malcolmt authored
Showing with 5 additions and 4 deletions.
  1. +5 −4 django/bin/make-messages.py
View
9 django/bin/make-messages.py
@@ -84,7 +84,7 @@ def make_messages():
thefile = '%s.py' % file
cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
- (stdin, stdout, stderr) = os.popen3(cmd, 'b')
+ (stdin, stdout, stderr) = os.popen3(cmd, 't')
msgs = stdout.read()
errors = stderr.read()
if errors:
@@ -101,12 +101,13 @@ def make_messages():
thefile = file
if file.endswith('.html'):
src = open(os.path.join(dirpath, file), "rb").read()
- open(os.path.join(dirpath, '%s.py' % file), "wb").write(templatize(src))
thefile = '%s.py' % file
- if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
+ open(os.path.join(dirpath, thefile), "wb").write(templatize(src))
+ if verbose:
+ 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"' % (
domain, os.path.join(dirpath, thefile))
- (stdin, stdout, stderr) = os.popen3(cmd, 'b')
+ (stdin, stdout, stderr) = os.popen3(cmd, 't')
msgs = stdout.read()
errors = stderr.read()
if errors:
Please sign in to comment.
Something went wrong with that request. Please try again.