Author: mtredinnick
Date: 2007-08-11 02:01:46 -0500 (Sat, 11 Aug 2007)
New Revision: 5842
Modified:
django/trunk/django/bin/make-messages.py
Log:
Fixed #4899 -- Fixed a problem on Windows when generating message catalogs
(caused by [5722]). Thanks, Ramiro Morales.
Modified: django/trunk/django/bin/make-messages.py
===================================================================
--- django/trunk/django/bin/make-messages.py 2007-08-11 06:54:58 UTC (rev
5841)
+++ django/trunk/django/bin/make-messages.py 2007-08-11 07:01:46 UTC (rev
5842)
@@ -84,7 +84,7 @@
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 @@
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:
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
