From ad6a032cebf59d1668caa7e726aa5da72e1cbb5c Mon Sep 17 00:00:00 2001
From: Stan Ulbrych <89152624+StanFromIreland@users.noreply.github.com>
Date: Sat, 5 Apr 2025 20:38:39 +0100
Subject: [PATCH] gh-131852: Filter out POT-Creation-Date in msgfmt (GH-131880)

Co-authored-by: Tomas R. <tomas.roun8@gmail.com>
---
 Lib/test/test_tools/msgfmt_data/general.json    |   2 +-
 Lib/test/test_tools/msgfmt_data/general.mo      | Bin 712 -> 671 bytes
 ...25-03-29-16-20-00.gh-issue-131852.afuefb.rst |   2 ++
 Tools/i18n/msgfmt.py                            |   9 +++++++--
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Tools-Demos/2025-03-29-16-20-00.gh-issue-131852.afuefb.rst

diff --git a/Lib/test/test_tools/msgfmt_data/general.json b/Lib/test/test_tools/msgfmt_data/general.json
index 8ceb34cd17f..0586113985a 100644
--- a/Lib/test/test_tools/msgfmt_data/general.json
+++ b/Lib/test/test_tools/msgfmt_data/general.json
@@ -1,7 +1,7 @@
 [
     [
         "",
-        "Project-Id-Version: PACKAGE VERSION\nPOT-Creation-Date: 2024-10-26 18:06+0200\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL@li.org>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
+        "Project-Id-Version: PACKAGE VERSION\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: LANGUAGE <LL@li.org>\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n"
     ],
     [
         "\n newlines \n",
diff --git a/Lib/test/test_tools/msgfmt_data/general.mo b/Lib/test/test_tools/msgfmt_data/general.mo
index 44b7363071a98bfe61eadc6adb0b434f1fd36125..ee905cbb3ec58db04c2f2fca5f67e15ce7a852c9 100644
GIT binary patch
delta 84
zcmX@XI-hkyitASf1_m8Q1_nMLt;EE@zyqWWfwTyawgb}gKsp#o7XxW#Ab&EHo(`pF
NPh7cjb2XzcBLK6n3d{fi

delta 123
zcmbQwdV+OAimMzW1A`6_^D!_mcr!6D@Bry3AT0u<(}A=+kgkE!bAU86kiQ2?AAr(F
zCazqm7NYB1l$uzQnV+ZYl30>zrC?-WWTI<mplf8NU}#}wV5V(gWMHt_pD}<D04~iG
A_W%F@

diff --git a/Misc/NEWS.d/next/Tools-Demos/2025-03-29-16-20-00.gh-issue-131852.afuefb.rst b/Misc/NEWS.d/next/Tools-Demos/2025-03-29-16-20-00.gh-issue-131852.afuefb.rst
new file mode 100644
index 00000000000..470c1b0879f
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2025-03-29-16-20-00.gh-issue-131852.afuefb.rst
@@ -0,0 +1,2 @@
+:program:`msgfmt` no longer adds the ``POT-Creation-Date`` to generated ``.mo`` files
+for consistency with GNU ``msgfmt``.
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
index 878d3e29077..cd5f1ed9f3e 100755
--- a/Tools/i18n/msgfmt.py
+++ b/Tools/i18n/msgfmt.py
@@ -158,14 +158,19 @@ def make(filename, outfile):
             msgctxt = b''
         elif l.startswith('msgid') and not l.startswith('msgid_plural'):
             if section == STR:
-                add(msgctxt, msgid, msgstr, fuzzy)
-                msgctxt = None
                 if not msgid:
+                    # Filter out POT-Creation-Date
+                    # See issue #131852
+                    msgstr = b''.join(line for line in msgstr.splitlines(True)
+                                      if not line.startswith(b'POT-Creation-Date:'))
+
                     # See whether there is an encoding declaration
                     p = HeaderParser()
                     charset = p.parsestr(msgstr.decode(encoding)).get_content_charset()
                     if charset:
                         encoding = charset
+                add(msgctxt, msgid, msgstr, fuzzy)
+                msgctxt = None
             section = ID
             l = l[5:]
             msgid = msgstr = b''