Merge pull request #10503 from AA-Turner/gettext-catalogue-fix

`gettext`: Ensure positions always sort
sphinx-doc · Jun 1, 2022 · 433c67e · 433c67e
2 parents 113e1d8 + a1ecf99
commit 433c67e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/sphinx/builders/gettext.py b/sphinx/builders/gettext.py
@@ -53,7 +53,10 @@ def add(self, msg: str, origin: Union[Element, "MsgOrigin"]) -> None:
         if msg not in self.metadata:  # faster lookup in hash
             self.messages.append(msg)
             self.metadata[msg] = []
-        self.metadata[msg].append((origin.source, origin.line, origin.uid))  # type: ignore
+        line = origin.line
+        if line is None:
+            line = -1
+        self.metadata[msg].append((origin.source, line, origin.uid))  # type: ignore
 
     def __iter__(self) -> Generator[Message, None, None]:
         for message in self.messages: