Ignore strings inside subscripts when extracting messages

babel/messages/extract.py

@@ -572,6 +572,10 @@ def extract_python(
     translator_comments = []
     in_def = in_translator_comments = False
     comment_tag = None
+    # Strings inside a subscript or a literal container are not arguments
+    # of the translation call. ``pgettext(ctx, labels["Guide"])`` and
+    # ``_({"msgid": "value"})`` must not extract those strings.
+    container_depth = 0
 
     encoding = parse_encoding(fileobj) or options.get('encoding', 'UTF-8')
     future_flags = parse_future_flags(fileobj, encoding)
@@ -614,7 +618,20 @@ def extract_python(
                     break
         elif funcname and len(call_stack) == 1:
             nested = tok == NAME and value in keywords
-            if (tok == OP and value == ')') or nested:
+            if tok == OP and value in '[{':
+                container_depth += 1
+            elif tok == OP and value in ']}' and container_depth:
+                container_depth -= 1
+            elif container_depth and (
+                tok == STRING
+                or tok in {FSTRING_START, FSTRING_MIDDLE, FSTRING_END}
+                or (tok == OP and value == ',')
+            ):
+                # dictionary["key"] and {"msgid": "value"} are not messages.
+                # A nested translation call inside the container is still
+                # handled below.
+                pass
+            elif (tok == OP and value == ')') or nested:
                 if buf:
                     messages.append(''.join(buf))
                     del buf[:]
@@ -643,6 +660,7 @@ def extract_python(
                 messages = []
                 translator_comments = []
                 in_translator_comments = False
+                container_depth = 0
                 if nested:
                     funcname = value
             elif tok == STRING:

tests/messages/test_extract.py

@@ -151,6 +151,26 @@ def test_issue_1195():
     assert message[2] == ['NOTE: Text describing a test string']
 
 
+def test_subscript_and_dict_literals_are_not_messages():
+    """Strings inside a subscript or a literal container are not arguments."""
+    buf = BytesIO(b"""\
+msg = pgettext(context, dictionary["key"])
+msg = _(labels["hello"])
+msg = _({"msgid": "value"})
+msg = _("kept")
+msg = pgettext("navigation", "Guide")
+msg = _(gettext("inner"))
+msg = ngettext("one apple", "many apples", n)
+""")
+    messages = list(extract.extract('python', buf, extract.DEFAULT_KEYWORDS, [], {}))
+    assert messages == [
+        (4, 'kept', [], None),
+        (5, 'Guide', [], 'navigation'),
+        (6, 'inner', [], None),
+        (7, ('one apple', 'many apples'), [], None),
+    ]
+
+
 def test_issue_1195_2():
     buf = BytesIO(b"""
 # NOTE: This should still be considered, even if