Re-apply fix and regenerate snapshots

tomasr8 · tomasr8 · commit 8295b2bf6cd5 · 2025-02-25T23:01:27.000+01:00
diff --git a/Lib/test/test_tools/msgfmt_data/general.json b/Lib/test/test_tools/msgfmt_data/general.json
@@ -4,53 +4,53 @@
         "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"
     ],
     [
-        "abc\u0004foo",
-        "bar"
+        "\n newlines \n",
+        "\n translated \n"
     ],
     [
-        "bar",
-        "baz"
+        "\"escapes\"",
+        "\"translated\""
     ],
     [
-        "xyz\u0004\n newlines \n",
-        "\n translated \n"
+        "Multilinestring",
+        "Multilinetranslation"
     ],
     [
-        "xyz\u0004\"escapes\"",
-        "\"translated\""
+        "abc\u0004foo",
+        "bar"
     ],
     [
-        "xyz\u0004Multilinestring",
-        "Multilinetranslation"
+        "bar",
+        "baz"
     ],
     [
         "xyz\u0004foo",
         "bar"
     ],
     [
         [
-            "abc\u0004One email sent.",
+            "One email sent.",
             0
         ],
         "One email sent."
     ],
     [
         [
-            "abc\u0004One email sent.",
+            "One email sent.",
             1
         ],
         "%d emails sent."
     ],
     [
         [
-            "xyz\u0004One email sent.",
+            "abc\u0004One email sent.",
             0
         ],
         "One email sent."
     ],
     [
         [
-            "xyz\u0004One email sent.",
+            "abc\u0004One email sent.",
             1
         ],
         "%d emails sent."
diff --git a/Lib/test/test_tools/msgfmt_data/general.mo b/Lib/test/test_tools/msgfmt_data/general.mo
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
@@ -149,6 +149,7 @@ def make(filename, outfile):
         elif l.startswith('msgid') and not l.startswith('msgid_plural'):
             if section == STR:
                 add(msgctxt, msgid, msgstr, fuzzy)
+                msgctxt = None
                 if not msgid:
                     # See whether there is an encoding declaration
                     p = HeaderParser()

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