Ticket #6073: compile-messages.py.diff

django/bin/compile-messages.py

@@ -34 +34 @@
             if f.endswith('.po'):
                 sys.stderr.write('processing file %s in %s\n' % (f, dirpath))
                 pf = os.path.splitext(os.path.join(dirpath, f))[0]
+                # msgfmt does not support files with byte order marks, so
+                # we have to make a tmp file without marks for compiling.
+                pofile = pf + '.po'
+                tmpfile = None
+                po = file(pofile)
+                s = po.read(4)
+                if s[:3] == '\xef\xbb\xbf':    # UTF-8
+                    remove = 3
+                elif s[:2] == '\xfe\xff':    # UTF-16 Big Endian
+                    remove = 2
+                elif s[:2] == '\xff\xfe':    # UTF-16 Little Endian
+                    remove = 2
+                elif s[:4] == '\x00\x00\xfe\xff':    # UTF-32 Big Endian
+                    remove = 4
+                elif s[:4] == '\xff\xfe\x00\x00':    # UTF-32 Little Endian
+                    remove = 4
+                else:
+                    remove = 0
+                if remove > 0:
+                    po.seek(remove)
+                    tmpfile = pofile + '.tmp'
+                    tmp = file(tmpfile, 'w+b')
+                    tmp.write(po.read())
+                    tmp.close()
+                    pofile = tmpfile
+                po.close()
                 # Store the names of the .mo and .po files in an environment
                 # variable, rather than doing a string replacement into the
                 # command, so that we can take advantage of shell quoting, to
                 # quote any malicious characters/escaping.
                 # See http://cyberelk.net/tim/articles/cmdline/ar01s02.html
                 os.environ['djangocompilemo'] = pf + '.mo'
-                os.environ['djangocompilepo'] = pf + '.po'
+                os.environ['djangocompilepo'] = pofile
                 if sys.platform == 'win32': # Different shell-variable syntax
                     cmd = 'msgfmt --check-format -o "%djangocompilemo%" "%djangocompilepo%"'
                 else:
                     cmd = 'msgfmt --check-format -o "$djangocompilemo" "$djangocompilepo"'
                 os.system(cmd)
 
+                if tmpfile:
+                    # Remove the tmp file we created.
+                    os.remove(tmpfile)
+
 def main():
     parser = optparse.OptionParser()
     parser.add_option('-l', '--locale', dest='locale',