Changeset 8576

Timestamp:

08/26/08 02:43:59 (3 months ago)

Author:

mtredinnick

Message:

Fixed #7084 -- Fixed the "makemessages" command to handle line endings
correctly on Windows (previous behaviour was to explode when encountering a
multi-line messages). Patch and testing from Ramiro Morales.

Files:

• django/trunk/django/core/management/commands/makemessages.py (modified) (4 diffs)

django/trunk/django/core/management/commands/makemessages.py

@@ -98 +98 @@
-                if verbosity > 1:
-                    sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
-b
+U
-                src = pythonize_re.sub('\n#', src)
-                open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
-                thefile = '%s.py' % file
+                open(os.path.join(dirpath, thefile), "w").write(src)
-                cmd = 'xgettext -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (domain, os.path.join(dirpath, thefile))
-                (stdin, stdout, stderr) = os.popen3(cmd, 't')
@@ -122 +122 @@
-                thefile = file
-                if file_ext in extensions:
-b
+U
-                    thefile = '%s.py' % file
-b
+
-                if verbosity > 1:
-                    sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
@@ -149 +149 @@
-
-        if os.path.exists(potfile):
-b
+t
-            msgs = stdout.read()
-            errors = stderr.read()
@@ -156 +156 @@
-            open(potfile, 'w').write(msgs)
-            if os.path.exists(pofile):
-b
+t
-                msgs = stdout.read()
-                errors = stderr.read()