fix(formatter): fixed formatting of plural tag in blocktrans

thanks @timoludwig closes #641
djlint · May 11, 2023 · 92c083b · 92c083b
1 parent 30f8d31
commit 92c083b
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/src/djlint/settings.py b/src/djlint/settings.py
@@ -533,7 +533,7 @@ def __init__(
 
         # these tags should be unindented and next line will be indented
         self.tag_unindent_line: str = r"""
-              (?:\{%-?[ ]*?(?:elif|else|empty))
+              (?:\{%-?[ ]*?(?:elif|else|empty|plural))
             | (?:
                 \{\{[ ]*?
                 (
@@ -675,6 +675,7 @@ def __init__(
             | block(?!trans)
             | endblock(?!trans)
             | else
+            | plural
             | spaceless
             | endspaceless
             | compress

diff --git a/tests/test_django/test_blocktrans.py b/tests/test_django/test_blocktrans.py
@@ -210,6 +210,21 @@
         ),
         id="blocktrans_autoescape_two",
     ),
+    pytest.param(
+        (
+            "{% blocktranslate count counter=list|length  %}\n"
+            "There is only one {{ name }} object.\n"
+            "  {% plural %}   There are {{ counter }} {{ name }} objects.\n"
+            "{% endblocktranslate %}\n"
+        ),
+        (
+            "{% blocktranslate count counter=list|length  %}\n"
+            "There is only one {{ name }} object.\n"
+            "  {% plural %}   There are {{ counter }} {{ name }} objects.\n"
+            "{% endblocktranslate %}\n"
+        ),
+        id="plural not formatted",
+    ),
 ]
 
 

diff --git a/tests/test_django/test_blocktrans_trimmed.py b/tests/test_django/test_blocktrans_trimmed.py
@@ -115,14 +115,14 @@
             "    (\n"
             "    {% blocktranslate count counter=images|length trimmed %}\n"
             "        {{ counter }} photo\n"
-            "        {% plural %}\n"
+            "    {% plural %}\n"
             "        {{ counter }} photos\n"
             "    {% endblocktranslate %}\n"
             "    )\n"
             "    (\n"
             "    {% blocktrans count counter=images|length trimmed %}\n"
             "        {{ counter }} photo\n"
-            "        {% plural %}\n"
+            "    {% plural %}\n"
             "        {{ counter }} photos\n"
             "    {% endblocktrans %}\n"
             "    )\n"
@@ -156,15 +156,15 @@
             "    (\n"
             "    {% blocktranslate count counter=images|length trimmed %}\n"
             "        {{ counter }} photo\n"
-            "        {% plural %}\n"
+            "    {% plural %}\n"
             "        asdf\n"
             "        {{ counter }} photos\n"
             "    {% endblocktranslate %}\n"
             "    )\n"
             "    (\n"
             "    {% blocktrans count counter=images|length trimmed %}\n"
             "        {{ counter }} photo\n"
-            "        {% plural %}\n"
+            "    {% plural %}\n"
             "        {{ counter }} photos\n"
             "    {% endblocktrans %}\n"
             "    )\n"
@@ -254,6 +254,23 @@
         ({"max_line_length": 10}),
         id="blocktrans_autoescape_two",
     ),
+    pytest.param(
+        (
+            "{% blocktranslate count counter=list|length trimmed  %}\n"
+            "There is only one {{ name }} object.\n"
+            "  {% plural %}   There are {{ counter }} {{ name }} objects.\n"
+            "{% endblocktranslate %}\n"
+        ),
+        (
+            "{% blocktranslate count counter=list|length trimmed %}\n"
+            "    There is only one {{ name }} object.\n"
+            "{% plural %}\n"
+            "    There are {{ counter }} {{ name }} objects.\n"
+            "{% endblocktranslate %}\n"
+        ),
+        ({}),
+        id="plural formatted",
+    ),
 ]