8000 gh-131852: Filter out POT-Creation-Date in ``msgfmt`` by StanFromIreland · Pull Request #131880 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-131852: Filter out POT-Creation-Date in msgfmt #131880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 5, 2025
Merged

gh-131852: Filter out POT-Creation-Date in msgfmt #131880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed0342c
Filter out POT-Creation-Date
StanFromIreland Mar 29, 2025
adcd533
Use re to keep final '\n'
StanFromIreland Mar 29, 2025
e0734a6
simplify
StanFromIreland Mar 29, 2025
2707ba6
Update Tools/i18n/msgfmt.py
StanFromIreland Mar 29, 2025
5368a97
Update Tools/i18n/msgfmt.py
StanFromIreland Apr 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Lib/test/test_tools/msgfmt_data/general.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Binary file modified Lib/test/test_tools/msgfmt_data/general.mo
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Tools-Demos/2025-03-29-16-20-00.gh-issue-131852.afuefb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:program:`msgfmt` no longer adds the ``POT-Creation-Date`` to generated ``.mo`` files
for consistency with GNU ``msgfmt``.
9 changes: 7 additions & 2 deletions Tools/i18n/msgfmt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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''
Expand Down
Loading
0