Ticket #3923: omit-headers-workaround.diff

make-messages.py

@@ -85 +85 @@
                 src = pythonize_re.sub('\n#', src)
                 open(os.path.join(dirpath, '%s.py' % file), "wb").write(src)
                 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))
+                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()
+                msgs = os.path.exists(potfile) and ''.join(stdout.readlines()[17:]) or stdout.read()
                 errors = stderr.read()
                 if errors:
                     print "errors happened while running xgettext on %s" % file