Ticket #13936: makemessages.py.patch

makemessages.py

@@ -38 +38 @@
     # trick xgettext to parse them as Python files)
     return set([x for x in ext_list if x != '.py'])
 
-def _popen(cmd):
+def _popen(cmd, cwd=None):
     """
     Friendly wrapper around Popen for Windows
     """
-    p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt', universal_newlines=True)
+    p = Popen(cmd, shell=True, stdout=PIPE, stderr=PIPE, close_fds=os.name != 'nt', universal_newlines=True, cwd=cwd)
     return p.communicate()
 
 def walk(root, topdown=True, onerror=None, followlinks=False):
@@ -190 +190 @@
                     f.write(src)
                 finally:
                     f.close()
-                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))
-                msgs, errors = _popen(cmd)
+                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(os.path.relpath(dirpath, basedir), thefile))
+                msgs, errors = _popen(cmd, cwd=basedir)
                 if errors:
                     raise CommandError("errors happened while running xgettext on %s\n%s" % (file, errors))
                 old = '#: '+os.path.join(dirpath, thefile)[2:]
@@ -226 +226 @@
                 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"' % (
-                    domain, os.path.join(dirpath, thefile))
-                msgs, errors = _popen(cmd)
+                    domain, os.path.join(os.path.relpath(dirpath, basedir), thefile))
+                msgs, errors = _popen(cmd, cwd=basedir)
                 if errors:
                     raise CommandError("errors happened while running xgettext on %s\n%s" % (file, errors))