Reset context when adding a message

tomasr8 · tomasr8 · commit 69402a5c23eb · 2025-02-24T21:18:00.000+01:00
diff --git a/Lib/test/test_tools/msgfmt_data/general.json b/Lib/test/test_tools/msgfmt_data/general.json
@@ -3,54 +3,54 @@
         "",
         "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"
     ],
+    [
+        "\n newlines \n",
+        "\n translated \n"
+    ],
+    [
+        "\"escapes\"",
+        "\"translated\""
+    ],
+    [
+        "Multilinestring",
+        "Multilinetranslation"
+    ],
     [
         [
-            "abc\u0004One email sent.",
+            "One email sent.",
             0
         ],
         "One email sent."
     ],
     [
         [
-            "abc\u0004One email sent.",
+            "One email sent.",
             1
         ],
         "%d emails sent."
     ],
-    [
-        "abc\u0004foo",
-        "bar"
-    ],
-    [
-        "bar",
-        "baz"
-    ],
-    [
-        "xyz\u0004\n newlines \n",
-        "\n translated \n"
-    ],
-    [
-        "xyz\u0004\"escapes\"",
-        "\"translated\""
-    ],
-    [
-        "xyz\u0004Multilinestring",
-        "Multilinetranslation"
-    ],
     [
         [
-            "xyz\u0004One email sent.",
+            "abc\u0004One email sent.",
             0
         ],
         "One email sent."
     ],
     [
         [
-            "xyz\u0004One email sent.",
+            "abc\u0004One email sent.",
             1
         ],
         "%d emails sent."
     ],
+    [
+        "abc\u0004foo",
+        "bar"
+    ],
+    [
+        "bar",
+        "baz"
+    ],
     [
         "xyz\u0004foo",
         "bar"
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()
