Add djade linter for Django templates (Fixes #2372)

.pre-commit-config.yaml

@@ -64,3 +64,8 @@ repos:
       rev: 0.2.2
       hooks:
           - id: checkmake
+    - repo: https://github.com/adamchainz/djade-pre-commit
+      rev: 1.6.0
+      hooks:
+          - id: djade
+            args: [--target-version, "5.2"]

dashboard/templates/base_dashboard.html

@@ -1,17 +1,18 @@
 {% extends "base.html" %}
-{% load i18n %}
-{% load static %}
+{% load i18n static %}
 
 {% block sectionid %}dashboard{% endblock %}
 
 {% block title %}{% translate 'Development dashboard' %}{% endblock %}
+
 {% block layout_class %}full-width{% endblock %}
+
 {% block header %}
   <h1>Development <em>dashboard</em></h1>
-{% endblock %}
+{% endblock header %}
 
 {% block javascript %}
   <script src="{% static "js/lib/jquery.min.js" %}"></script>
   <script src="{% static "js/lib/jquery.flot.min.js" %}"></script>
   <script src="{% static "js/dashboard/utils.js" %}"></script>
-{% endblock %}
+{% endblock javascript %}

dashboard/templates/dashboard/detail.html

@@ -11,10 +11,10 @@ <h2><a href="{{ metric.link }}">{{ metric }}</a></h2>
     </div>
     <a class="link-readmore back-link" href="{% url "dashboard-index" host "dashboard" %}">{% translate "All metrics" %}</a>
   </div>
-{% endblock %}
+{% endblock content %}
 
 {% block javascript %}
   {{ block.super }}
 
   <script src="{% static "js/dashboard/detail.js" %}"></script>
-{% endblock %}
+{% endblock javascript %}

dashboard/templates/dashboard/index.html

@@ -1,6 +1,5 @@
 {% extends "base_dashboard.html" %}
-{% load i18n %}
-{% load static %}
+{% load i18n static %}
 
 {% block content %}
   <div>
@@ -23,10 +22,10 @@ <h3><a href="{{ report.metric.link }}">{{ report.metric.name }}</a></h3>
       {% blocktranslate with timestamp=data.0.latest.timestamp|timesince %}Updated {{ timestamp }} ago.{% endblocktranslate %}
     </p>
   </div>
-{% endblock %}
+{% endblock content %}
 
 {% block javascript %}
   {{ block.super }}
 
   <script src="{% static "js/dashboard/index.js" %}"></script>
-{% endblock %}
+{% endblock javascript %}

djangoproject/templates/400.html

@@ -9,4 +9,4 @@
     <h2>{% translate "Bad request" %}</h2>
 
     <p>{% translate "Yikes, this was a bad request. Not sure why, but it sure was bad." %}</p>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/403.html

@@ -9,4 +9,4 @@
     <h2>{% translate "Permission denied" %}</h2>
 
     <p>{% translate "Apologies, but it seems as if you're not allowed to access this page. We honestly hope this is just a mistake." %}</p>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/404.html

@@ -20,4 +20,4 @@ <h2>{% translate "Page not found" %}</h2>
       Here's a link to the <a href="{{ homepage_url }}">homepage</a>. You know, just in case.
     {% endblocktranslate %}</p>
 
-{% endblock %}
+{% endblock content %}

djangoproject/templates/410.html

@@ -23,4 +23,4 @@ <h2>{% translate "Page removed." %}</h2>
     {% endblocktranslate %}
   </p>
 
-{% endblock %}
+{% endblock content %}

djangoproject/templates/500.html

@@ -13,4 +13,4 @@ <h2>{% translate "Page unavailable" %}</h2>
     <p>{% translate "We're messing around with things internally, and the server had a bit of a hiccup." %}</p>
 
     <p>{% translate "Please try again later." %}</p>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/accounts/delete_profile.html

@@ -37,4 +37,4 @@ <h2>{% translate "Are you sure?" %}</h2>
             </div>
         </form>
     {% endif %}
-{% endblock %}
+{% endblock content %}

djangoproject/templates/accounts/delete_profile_success.html

@@ -13,4 +13,4 @@ <h2>{% translate "Account deleted" %}</h2>
             around on our <a href="{{ community_index_url }}">various community spaces</a>, online and off.
         {% endblocktranslate %}
     </p>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/accounts/edit_profile.html

@@ -31,7 +31,7 @@ <h1>{% translate "Edit your profile" %}</h1>
             <input class="cta" type="submit" value="{% translate "Save" %}"/>
         </div>
     </form>
-{% endblock %}
+{% endblock content %}
 
 {% block content-related %}
     <div role="complementary">
@@ -56,4 +56,4 @@ <h2 id="aside-header">{% translate "Help" %}</h2>
             </a>
         </p>
     </div>
-{% endblock %}
+{% endblock content-related %}

djangoproject/templates/accounts/user_profile.html

@@ -30,7 +30,7 @@ <h2 id="aside-header">
             </li>
         </ul>
     </div>
-{% endblock %}
+{% endblock content-related %}
 
 {% block content %}
     <div class="user-info">
@@ -54,7 +54,7 @@ <h2>{% translate "Statistics on Django core contributions:" %}</h2>
             </ul>
         {% endif %}
 
-        {% with user_obj.owned_feeds.all as feeds %}
+        {% with feeds=user_obj.owned_feeds.all %}
             {% if feeds %}
                 <h2>{% translate "Community feeds:" %}</h2>
                 <ul>

djangoproject/templates/aggregator/delete-confirm.html

@@ -16,4 +16,4 @@ <h2 class="deck">{% blocktranslate %}Really delete {{ feed }}?{% endblocktransla
     {% csrf_token %}
     <p class="submit"><input class="cta" type="submit" value="{% translate "Yes, delete the feed." %}"></p>
   </form>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/aggregator/denied.html

@@ -5,4 +5,4 @@
     <h1>{% translate "Community" %}</h1>
 
     <h2>{% translate "Sorry, you can't do that." %}</h2>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/aggregator/ecosystem.html

@@ -459,4 +459,4 @@ <h3 id="utilities-miscellaneous">
     </li>
   </ul>
 
-{% endblock %}
+{% endblock content %}

djangoproject/templates/aggregator/edit-feed.html

@@ -27,4 +27,4 @@ <h2 class="deck">{% blocktranslate %}Edit {{ feed }}:{% endblocktranslate %}</h2
     {% endif %}
   </form>
 
-{% endblock %}
+{% endblock content %}

djangoproject/templates/aggregator/feeditem_list.html

@@ -44,4 +44,4 @@ <h2><a href="{{ item.link }}">{{ item.title }}</a></h2>
     </div>
   {% endif %}
 
-{% endblock %}
+{% endblock content %}

djangoproject/templates/aggregator/index.html

@@ -96,4 +96,4 @@ <h2 class="bullet-icon"><i class="icon icon-rss blue"></i> {{ feedtype.name }}</
       </li>
     {% endfor %}
   </ul>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/aggregator/local-django-community.html

@@ -3,7 +3,7 @@
 
 {% block content %}
 
-{#  Group meetups by country and then by location #}
+{# Group meetups by country and then by location #}
   {% regroup django_communities|dictsort:"continent" by continent as grouped_django_communities %}
 
 
@@ -14,14 +14,14 @@ <h1>{% translate "Local Django Communities" %}</h1>
   {% if grouped_django_communities %}<h3 id="table-of-contents">{% translate "Table of contents" %}<a class="plink" href="#table-of-contents"> ¶</a></h3>{% endif %}
   <ul>
     {% for local_django_community in grouped_django_communities %}
-      <li><a href="#{{ local_django_community.grouper.title | lower }}-meetups">{{ local_django_community.grouper.title }}</a></li>
+      <li><a href="#{{ local_django_community.grouper.title|lower }}-meetups">{{ local_django_community.grouper.title }}</a></li>
     {% endfor %}
   </ul>
 
 
   {% for local_django_community in grouped_django_communities %}
-    <div id="{{ local_django_community.grouper.title | lower }}-meetups" class="section">
-      <h2>{{ local_django_community.grouper.title }} <a class="plink" href="#{{ local_django_community.grouper.title | lower }}-meetups">¶</a></h2>
+    <div id="{{ local_django_community.grouper.title|lower }}-meetups" class="section">
+      <h2>{{ local_django_community.grouper.title }} <a class="plink" href="#{{ local_django_community.grouper.title|lower }}-meetups">¶</a></h2>
       <ul>
         {% for django_community in local_django_community.list %}
           <li>
@@ -50,5 +50,4 @@ <h3 id="{{ django_community.slug }}-meetup">{{ django_community.name }} <a class
     {% translate "Local Django communities are coming soon. Please check back later." %}
 
   {% endfor %}
-{##}
-{% endblock %}
+{% endblock content %}

djangoproject/templates/aggregator/my-feeds.html

@@ -24,4 +24,4 @@ <h2 class="deck">{% translate "Manage your community aggregator feeds:" %}</h2>
   {# <li>Claim a feed already in the system.</li> #}
     </ul>
   </div>
-{% endblock %}
+{% endblock content %}

djangoproject/templates/base.html

@@ -10,7 +10,7 @@
     <meta name="keywords" content="Python, Django, framework, open-source" />
     <meta name="description" content="{% block description %}{% endblock %}" />
     <meta name="fediverse:creator" content="@django@fosstodon.org" />
-    {% block link_rel_tags %}{% endblock link_rel_tags %}
+    {% block link_rel_tags %}{% endblock %}
     <!-- Favicons -->
     <link rel="apple-touch-icon" href="{% static "img/icon-touch.png" %}">
     <link rel="icon" sizes="192x192" href="{% static "img/icon-touch.png" %}">
@@ -23,12 +23,12 @@
       <meta property="og:title" content="{% block og_title %}Django{% endblock %}" />
       <meta property="og:description" content="{% block og_description %}{% spaceless %}
                                                  The web framework for perfectionists with deadlines.
-                                               {% endspaceless %}{% endblock %}" />
+                                               {% endspaceless %}{% endblock og_description %}" />
       <meta property="og:image" content="{% block og_image %}{% static "img/logos/django-logo-negative.png" %}{% endblock %}" />
       <meta property="og:image:alt" content="{% block og_image_alt %}Django logo{% endblock %}" />
       <meta property="og:image:width" content="{% block og_image_width %}1200{% endblock %}" />
       <meta property="og:image:height" content="{% block og_image_height %}546{% endblock %}" />
-      <meta property="og:image:type" content="{% block og_image_type%}image/png{% endblock %}"/>
+      <meta property="og:image:type" content="{% block og_image_type %}image/png{% endblock %}"/>
       <meta property="og:url" content="{{ request.build_absolute_uri }}" />
       <meta property="og:site_name" content="Django Project" />
 
@@ -42,7 +42,7 @@
     <link rel="stylesheet" href="{% static "css/output.css" %}" >
 
     <script src="{% static "js/mod/switch-dark-mode.js" %}"></script>
-    {% block head_extra %}{% endblock head_extra %}
+    {% block head_extra %}{% endblock %}
   </head>
 
   <body id="{% block sectionid %}generic{% endblock %}" class="{% block body_class %}{% endblock %}">
@@ -75,7 +75,7 @@
               {% endfor %}
             </ul>
           {% endif %}
-        {% endblock %}
+        {% endblock messages %}
 
         {% block content %}{% endblock %}
         <a href="#top" class="backtotop"><i class="icon icon-chevron-up"></i> Back to Top</a>
@@ -91,7 +91,7 @@
 
     {# Used to display urgent news, events, and alerts #}
     {% block alert %}
-    {% endblock %}
+    {% endblock alert %}
 
     <!-- SVGs -->
     <svg xmlns="http://www.w3.org/2000/svg">
@@ -103,9 +103,9 @@
 
     {% block footer %}
       {% include "includes/footer.html" %}
-    {% endblock %}
+    {% endblock footer %}
 
-    {% block body_extra %}{% endblock body_extra %}
+    {% block body_extra %}{% endblock %}
 
     {% block javascript %}
       {# Require JS #}
@@ -132,6 +132,6 @@
       </script>
       <script data-main="{% static "js/main.js" %}" src="{% static "js/lib/require.js" %}"></script>
       <script src="{% static "js/djangoproject.js" %}"></script>
-    {% endblock %}
+    {% endblock javascript %}
   </body>
 </html>

djangoproject/templates/base_2col.html

@@ -3,12 +3,12 @@
 {% block columnwrap %}
   <div id="content-main">
     {% block content %}
-    {% endblock %}
+    {% endblock content %}
   </div>
   <!-- END #content-main -->
   <aside id="content-related" class="sidebar" aria-labelledby="aside-header">
     {% block content-related %}
-    {% endblock %}
+    {% endblock content-related %}
   </aside>
   <!-- END #content-related -->
-{% endblock %}
+{% endblock columnwrap %}

djangoproject/templates/base_3col.html

@@ -16,4 +16,4 @@
     {% block content-extra %}{% endblock %}
   </div>
   <!-- END #content-extra -->
-{% endblock %}
+{% endblock columnwrap %}

djangoproject/templates/base_code.html

@@ -3,9 +3,11 @@
 {% block sectionid %}code{% endblock %}
 
 {% block og_title %}Django source code{% endblock %}
+
 {% block og_description %}Django source code{% endblock %}
 
 {% block title %}Code{% endblock %}
+
 {% block layout_class %}full-width{% endblock %}
 
 {% block header %}<h1>Django source code</h1>{% endblock %}

djangoproject/templates/base_community.html

@@ -2,9 +2,11 @@
 {% load fundraising_extras i18n %}
 
 {% block og_title %}{% translate "Django Community" %}{% endblock %}
+
 {% block og_description %}{% translate "Building the Django Community. Come join us!" %}{% endblock %}
 
 {% block layout_class %}sidebar-right{% endblock %}
+
 {% block title %}{% translate "Django Community" %}{% endblock %}
 
 {% block header %}
@@ -18,7 +20,7 @@
     {% endif %}
     {% translate "Come join us!" %}
   </p>
-{% endblock %}
+{% endblock header %}
 
 {% block content-related %}
   <div role="complementary">
@@ -63,4 +65,4 @@ <h3>{% translate "More Links" %}</h3>
       <dd>{% translate "Download official logos" %}</dd>
     </dl>
   </div>
-{% endblock %}
+{% endblock content-related %}

djangoproject/templates/base_foundation.html

@@ -1,14 +1,15 @@
 {% extends "base.html" %}
-{% load fundraising_extras meetings i18n %}
+{% load fundraising_extras i18n meetings %}
 
 {% block og_title %}Django Software Foundation{% endblock %}
 
 {% block layout_class %}sidebar-right{% endblock %}
+
 {% block title %}Django Software Foundation{% endblock %}
 
 {% block header %}
   <p>Django Software Foundation</p>
-{% endblock %}
+{% endblock header %}
 
 {% block content-related %}
 
@@ -32,4 +33,4 @@ <h3>{% translate "Latest DSF meeting minutes" %}</h3>
     {% render_latest_meeting_minute_entries 2 %}
     <a href="{% url 'foundation_meeting_archive_index' %}" class="link-readmore">{% translate "More meeting minutes" %}</a>
   </div>
-{% endblock %}
+{% endblock content-related %}