From b595ca1959bfd2a20d77c928a90491bfe55ac75c Mon Sep 17 00:00:00 2001
From: Jean Abou Samra <jean@abou-samra.fr>
Date: Tue, 15 Feb 2022 19:37:11 +0100
Subject: [PATCH] fixups

---
 sphinx/transforms/i18n.py                         |  4 ++--
 .../test-intl/xx/LC_MESSAGES/literalblock.po      |  4 ++--
 tests/roots/test-intl/xx/LC_MESSAGES/noqa.po      | 15 ++++++---------
 tests/test_intl.py                                | 13 +++++++------
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/sphinx/transforms/i18n.py b/sphinx/transforms/i18n.py
index 6c97793cf6f..0c3d8ef6a90 100644
--- a/sphinx/transforms/i18n.py
+++ b/sphinx/transforms/i18n.py
@@ -9,7 +9,7 @@
 """
 
 from os import path
-from re import match, MULTILINE
+from re import match, DOTALL
 from textwrap import indent
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Type, TypeVar
 
@@ -84,7 +84,7 @@ def publish_msgstr(app: "Sphinx", source: str, source_path: str, source_line: in
 
 
 def parse_noqa(source: str) -> Tuple[str, bool]:
-    m = match(r"(.*)(?<!\\)#\s*noqa\s*$", source, MULTILINE)
+    m = match(r"(.*)(?<!\\)#\s*noqa\s*$", source, DOTALL)
     if m:
         return m.group(1), True
     else:
diff --git a/tests/roots/test-intl/xx/LC_MESSAGES/literalblock.po b/tests/roots/test-intl/xx/LC_MESSAGES/literalblock.po
index b3d8ba73f7b..8d3e5d8bec1 100644
--- a/tests/roots/test-intl/xx/LC_MESSAGES/literalblock.po
+++ b/tests/roots/test-intl/xx/LC_MESSAGES/literalblock.po
@@ -80,8 +80,8 @@ msgstr "LITERAL-BLOCK\n"
 msgid "test_code_for_noqa()\n"
 "continued()"
 msgstr ""
-"# Trailing noqa should not get stripped\n"
-"# from this block. #noqa"
+"# TRAILING noqa SHOULD NOT GET STRIPPED\n"
+"# FROM THIS BLOCK. #noqa"
 
 msgid "doctest blocks"
 msgstr "DOCTEST-BLOCKS"
diff --git a/tests/roots/test-intl/xx/LC_MESSAGES/noqa.po b/tests/roots/test-intl/xx/LC_MESSAGES/noqa.po
index 483e98e6f90..1af66b47df0 100644
--- a/tests/roots/test-intl/xx/LC_MESSAGES/noqa.po
+++ b/tests/roots/test-intl/xx/LC_MESSAGES/noqa.po
@@ -19,7 +19,7 @@ msgstr ""
 
 #: ../tests/roots/test-intl/noqa.txt:2
 msgid "First section"
-msgstr ""
+msgstr "FIRST SECTION"
 
 #: ../tests/roots/test-intl/noqa.txt:4
 msgid "Some text with a reference, :ref:`next-section`."
@@ -28,20 +28,17 @@ msgstr "TRANSLATED TEXT WITHOUT REFERENCE. #noqa"
 #: ../tests/roots/test-intl/noqa.txt:6
 msgid "Another reference: :ref:`next-section`."
 msgstr ""
-"TEST WHITESPACE INSENSITIVITY.\n"
-"\n"
-"\n"
-"     #  \n"
-"\n"
-"noqa"
+"TEST noqa WHITESPACE INSENSITIVITY.\n"
+"#   \n"
+"   noqa"
 
 #: ../tests/roots/test-intl/noqa.txt:8
 msgid "This should allow to test escaping ``#noqa``."
-msgstr "``#noqa`` is escaped at the end of this string. \\#noqa"
+msgstr "``#noqa`` IS ESCAPED AT THE END OF THIS STRING. \\#noqa"
 
 #: ../tests/roots/test-intl/noqa.txt:13
 msgid "Next section"
-msgstr ""
+msgstr "NEXT SECTION WITH PARAGRAPH TO TEST BARE noqa"
 
 # This edge case should not fail.
 #: ../tests/roots/test-intl/noqa.txt:15
diff --git a/tests/test_intl.py b/tests/test_intl.py
index 29607618041..c1c6a4d6e38 100644
--- a/tests/test_intl.py
+++ b/tests/test_intl.py
@@ -198,20 +198,21 @@ def test_text_inconsistency_warnings(app, warning):
 def test_noqa(app, warning):
     app.build()
     result = (app.outdir / 'noqa.txt').read_text()
-    expect = r"""First section
+    expect = r"""FIRST SECTION
 *************
 
 TRANSLATED TEXT WITHOUT REFERENCE.
 
-TEST WHITESPACE INSENSITIVITY.
+TEST noqa WHITESPACE INSENSITIVITY.
 
-"#noqa" is escaped at the end of this string. #noqa
+"#noqa" IS ESCAPED AT THE END OF THIS STRING. #noqa
 
 
-Next section
-************
+NEXT SECTION WITH PARAGRAPH TO TEST BARE noqa
+*********************************************
 
-Some text, again referring to the section: Next section.
+Some text, again referring to the section: NEXT SECTION WITH PARAGRAPH
+TO TEST BARE noqa.
 """
     assert result == expect
     assert "next-section" not in getwarning(warning)