8000 gh-85012: Properly reset msgctxt when compiling messages with msgfmt … · python/cpython@7ea6e88 · GitHub
[go: up one dir, main page]
Skip to content

Commit 7ea6e88

Browse files
tomasr8tomasr8
authored
gh-85012: Properly reset msgctxt when compiling messages with msgfmt (GH-130525)
Add also human-readable snapshots for tests.
1 parent c5abded commit 7ea6e88

File tree

6 files changed

+94
-0
lines changed

6 files changed

+94
-0
lines changed

‎Lib/test/test_tools/msgfmt_data/fuzzy.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[]

‎Lib/test/test_tools/msgfmt_data/general.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
[
2+
[
3+
"",
4+
"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"
5+
],
6+
[
7+
"\n newlines \n",
8+
"\n translated \n"
9+
],
10+
[
11+
"\"escapes\"",
12+
"\"translated\""
13+
],
14+
[
15+
"Multilinestring",
16+
"Multilinetranslation"
17+
],
18+
[
19+
"abc\u0004foo",
20+
"bar"
21+
],
22+
[
23+
"bar",
24+
"baz"
25< 8000 /td>+
],
26+
[
27+
"xyz\u0004foo",
28+
"bar"
29+
],
30+
[
31+
[
32+
"One email sent.",
33+
0
34+
],
35+
"One email sent."
36+
],
37+
[
38+
[
39+
"One email sent.",
40+
1
41+
],
42+
"%d emails sent."
43+
],
44+
[
45+
[
46+
"abc\u0004One email sent.",
47+
0
48+
],
49+
"One email sent."
50+
],
51+
[
52+
[
53+
"abc\u0004One email sent.",
54+
1
55+
],
56+
"%d emails sent."
57+
]
58+
]

‎Lib/test/test_tools/msgfmt_data/general.mo

-16 Bytes
Binary file not shown.

‎Lib/test/test_tools/test_msgfmt.py

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
"""Tests for the Tools/i18n/msgfmt.py tool."""
22

3+
import json
34
import sys
45
import unittest
56
from gettext import GNUTranslations
@@ -39,6 +40,28 @@ def test_compilation(self):
3940

4041
self.assertDictEqual(actual._catalog, expected._catalog)
4142

43+
def test_translations(self):
44+
with open(data_dir / 'general.mo', 'rb') as f:
45+
t = GNUTranslations(f)
46+
47+
self.assertEqual(t.gettext('foo'), 'foo')
48+
self.assertEqual(t.gettext('bar'), 'baz')
49+
self.assertEqual(t.pgettext('abc', 'foo'), 'bar')
50+
self.assertEqual(t.pgettext('xyz', 'foo'), 'bar')
51+
self.assertEqual(t.gettext('Multilinestring'), 'Multilinetranslation')
52+
self.assertEqual(t.gettext('"escapes"'), '"translated"')
53+
self.assertEqual(t.gettext('\n newlines \n'), '\n translated \n')
54+
self.assertEqual(t.ngettext('One email sent.', '%d emails sent.', 1),
55+
'One email sent.')
56+
self.assertEqual(t.ngettext('One email sent.', '%d emails sent.', 2),
57+
'%d emails sent.')
58+
self.assertEqual(t.npgettext('abc', 'One email sent.',
59+
'%d emails sent.', 1),
60+
'One email sent.')
61+
self.assertEqual(t.npgettext('abc', 'One email sent.',
62+
'%d emails sent.', 2),
63+
'%d emails sent.')
64+
4265
def test_po_with_bom(self):
4366
with temp_cwd():
4467
Path('bom.po').write_bytes(b'\xef\xbb\xbfmsgid "Python"\nmsgstr "Pioton"\n')
@@ -125,6 +148,16 @@ def update_catalog_snapshots():
125148
for po_file in data_dir.glob('*.po'):
126149
mo_file = po_file.with_suffix('.mo')
127150
compile_messages(po_file, mo_file)
151+
# Create a human-readable JSON file which is
152+
# easier to review than the binary .mo file.
153+
with open(mo_file, 'rb') as f:
154+
translations = GNUTranslations(f)
155+
catalog_file = po_file.with_suffix('.json')
156+
with open(catalog_file, 'w') as f:
157+
data = translations._catalog.items()
158+
data = sorted(data, key=lambda x: (isinstance(x[0], tuple), x[0]))
159+
json.dump(data, f, indent=4)
160+
f.write('\n')
128161

129162

130163
if __name__ == '__main__':

‎Misc/NEWS.d/next/Tools-Demos/2025-02-24-21-36-23.gh-issue-85012.9K1U0E.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Correctly reset ``msgctxt`` when compiling messages in :program:`msgfmt`.

‎Tools/i18n/msgfmt.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ def make(filename, outfile):
159159
elif l.startswith('msgid') and not l.startswith('msgid_plural'):
160160
if section == STR:
161161
add(msgctxt, msgid, msgstr, fuzzy)
162+
msgctxt = None
162163
if not msgid:
163164
# See whether there is an encoding declaration
164165
p = HeaderParser()

0 commit comments

Comments
 (0)
0