Ticket #6106: 6106-1.diff

django/core/management/commands/makemessages.py

@@ -10 +10 @@
 from django.core.management.base import CommandError, BaseCommand
 
 pythonize_re = re.compile(r'\n\s*//')
+pot_timestamp_re = re.compile(r'^"POT-Creation-Date:[^\\]+', re.MULTILINE)
 
 def handle_extensions(extensions=('html',)):
     """
@@ -36 +37 @@
     # trick xgettext to parse them as Python files)
     return set([x for x in ext_list if x != '.py'])
 
+def get_pot_timestamp(pofname):
+    """
+    Extracts the POT-Creation-Date header line from .po file pofname.
+    """
+    if not os.path.exists(pofname):
+        return None
+    tstamp = None
+    pof = open(pofname, "rU")
+    try:
+        for c, line in enumerate(pof):
+            if not line or c == 30:
+                break
+            m = pot_timestamp_re.search(line)
+            if m:
+                tstamp = m.group(0)
+                break
+    finally:
+        pof.close()
+    return tstamp
+
 def make_messages(locale=None, domain='django', verbosity='1', all=False, extensions=None):
     """
     Uses the locale directory from the Django SVN tree or an application/
@@ -93 +114 @@
         pofile = os.path.join(basedir, '%s.po' % domain)
         potfile = os.path.join(basedir, '%s.pot' % domain)
 
+        # If there is a .po file already, get its POT creation timestamp header
+        pot_timestamp = get_pot_timestamp(pofile)
+
         if os.path.exists(potfile):
             os.unlink(potfile)
 
@@ -173 +197 @@
                 errors = p.stderr.read()
                 if errors:
                     raise CommandError("errors happened while running msgmerge\n%s" % errors)
+                if pot_timestamp:
+                    # Put back the POT creation timestamp we preserved
+                    msgs = pot_timestamp_re.sub(pot_timestamp, msgs)
             open(pofile, 'wb').write(msgs)
             os.unlink(potfile)