Ticket #7084: t7084-r8255.diff

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

@@ -97 +97 @@
-            if domain == 'djangojs' and file_ext == '.js':
-                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')
-                msgs = stdout.read()
@@ -121 +121 @@
-            elif domain == 'django' and (file_ext == '.py' or file_ext in extensions):
-                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))
-                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"' % (