From 8cec44a35d8f38284f2ea52f2f338a7154d86afb Mon Sep 17 00:00:00 2001 From: Anshul Zilpe Date: Mon, 8 Dec 2025 23:09:21 +0530 Subject: Add djade linter and format templates. --- .pre-commit-config.yaml | 5 ++ .../checklists/release-security-skeleton.md | 3 +- .../templates/checklists/release_final_blogpost.md | 2 +- .../checklists/release_security_blogpost.md | 2 +- dashboard/templates/base_dashboard.html | 9 +-- dashboard/templates/dashboard/detail.html | 4 +- dashboard/templates/dashboard/index.html | 7 +-- djangoproject/templates/400.html | 2 +- djangoproject/templates/403.html | 2 +- djangoproject/templates/404.html | 2 +- djangoproject/templates/410.html | 2 +- djangoproject/templates/500.html | 2 +- .../templates/accounts/delete_profile.html | 2 +- .../templates/accounts/delete_profile_success.html | 2 +- djangoproject/templates/accounts/edit_profile.html | 4 +- djangoproject/templates/accounts/user_profile.html | 4 +- .../templates/aggregator/delete-confirm.html | 2 +- djangoproject/templates/aggregator/denied.html | 2 +- djangoproject/templates/aggregator/ecosystem.html | 4 +- djangoproject/templates/aggregator/edit-feed.html | 2 +- .../templates/aggregator/feeditem_list.html | 2 +- djangoproject/templates/aggregator/index.html | 4 +- .../aggregator/local-django-community.html | 11 ++-- djangoproject/templates/aggregator/my-feeds.html | 2 +- djangoproject/templates/base.html | 18 +++--- djangoproject/templates/base_2col.html | 6 +- djangoproject/templates/base_3col.html | 2 +- djangoproject/templates/base_code.html | 2 + djangoproject/templates/base_community.html | 8 ++- djangoproject/templates/base_foundation.html | 7 ++- djangoproject/templates/base_weblog.html | 9 +-- djangoproject/templates/blog/entry_archive.html | 2 +- .../templates/blog/entry_archive_day.html | 2 +- .../templates/blog/entry_archive_month.html | 2 +- .../templates/blog/entry_archive_year.html | 2 +- djangoproject/templates/blog/entry_detail.html | 2 +- djangoproject/templates/conduct/base.html | 4 +- djangoproject/templates/conduct/changes.html | 3 +- djangoproject/templates/conduct/enforcement.html | 3 +- djangoproject/templates/conduct/faq.html | 3 +- djangoproject/templates/conduct/index.html | 3 +- djangoproject/templates/conduct/reporting.html | 7 ++- djangoproject/templates/contact/foundation.html | 2 +- djangoproject/templates/contact/sent.html | 2 +- djangoproject/templates/diversity/base.html | 5 +- djangoproject/templates/diversity/changes.html | 3 +- djangoproject/templates/diversity/index.html | 2 +- djangoproject/templates/flatfiles/default.html | 2 +- djangoproject/templates/flatfiles/overview.html | 2 +- djangoproject/templates/flatpages/code.html | 2 +- djangoproject/templates/flatpages/community.html | 2 +- djangoproject/templates/flatpages/default.html | 4 +- djangoproject/templates/flatpages/foundation.html | 4 +- .../templates/foundation/banner_preview.html | 2 +- .../templates/foundation/coreawardcohort_list.html | 5 +- .../templates/foundation/meeting_archive.html | 5 +- .../templates/foundation/meeting_archive_day.html | 5 +- .../foundation/meeting_archive_month.html | 3 +- .../templates/foundation/meeting_archive_year.html | 3 +- .../templates/foundation/meeting_detail.html | 3 +- .../templates/foundation/meeting_snippet.html | 2 +- djangoproject/templates/fundraising/index.html | 12 ++-- .../templates/fundraising/manage-donations.html | 4 +- djangoproject/templates/fundraising/thank-you.html | 2 +- djangoproject/templates/homepage.html | 12 ++-- .../templates/members/corporate_member_badges.html | 2 +- .../members/corporate_members_join_thanks.html | 2 +- .../templates/members/corporatemember_form.html | 4 +- .../templates/members/corporatemember_list.html | 5 +- .../templates/members/individualmember_list.html | 2 +- djangoproject/templates/members/team_list.html | 7 ++- djangoproject/templates/overview.html | 10 ++-- djangoproject/templates/registration/activate.html | 2 +- .../registration/activation_complete.html | 2 +- djangoproject/templates/registration/base.html | 1 + .../templates/registration/logged_out.html | 2 +- djangoproject/templates/registration/login.html | 6 +- .../registration/password_reset_email.html | 2 +- .../registration/registration_complete.html | 2 +- .../templates/registration/registration_form.html | 4 +- djangoproject/templates/releases/download.html | 17 ++++-- djangoproject/templates/releases/roadmap.html | 8 ++- djangoproject/templates/start.html | 7 ++- djangoproject/templates/styleguide.html | 5 +- .../templates/tracdb/bouncing_tickets.html | 2 +- docs/templates/base_docs.html | 8 +-- docs/templates/docs/doc.html | 68 +++++++++++----------- docs/templates/docs/genindex.html | 12 ++-- docs/templates/docs/py-modindex.html | 10 ++-- docs/templates/docs/search_description.xml | 6 +- docs/templates/docs/search_results.html | 9 ++- 91 files changed, 259 insertions(+), 202 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 841663e4..2098296f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -75,3 +75,8 @@ repos: rev: 0.2.2 hooks: - id: checkmake + - repo: https://github.com/adamchainz/djade-pre-commit + rev: 1.7.0 + hooks: + - id: djade + args: [--target-version, "6.0"] diff --git a/checklists/templates/checklists/release-security-skeleton.md b/checklists/templates/checklists/release-security-skeleton.md index a295b159..69169593 100644 --- a/checklists/templates/checklists/release-security-skeleton.md +++ b/checklists/templates/checklists/release-security-skeleton.md @@ -1,5 +1,4 @@ -{% load checklist_extras %} -{% load tz %} +{% load checklist_extras tz %} {% with cves=instance.cves versions=instance.versions cves_length=instance.cves|length %} # Django Security Release: {{ versions|enumerate_items }} ({{ when }}) diff --git a/checklists/templates/checklists/release_final_blogpost.md b/checklists/templates/checklists/release_final_blogpost.md index dc60a6be..5d2eb06f 100644 --- a/checklists/templates/checklists/release_final_blogpost.md +++ b/checklists/templates/checklists/release_final_blogpost.md @@ -11,7 +11,7 @@ You can get Django {{ version }} from {% include "checklists/_releaser_info.md" %} {% if instance.eom_release %} -With the release of Django {{ version }}, Django {{ instance.eom_release.feature_version}} +With the release of Django {{ version }}, Django {{ instance.eom_release.feature_version }} has reached the end of mainstream support. The final minor bug fix release, [{{ instance.eom_release.version }}](https://docs.djangoproject.com/en/stable/releases/{{ instance.eom_release.version }}/), was issued on {{ instance.eom_release.date }}. Django {{ instance.eom_release.feature_version }} diff --git a/checklists/templates/checklists/release_security_blogpost.md b/checklists/templates/checklists/release_security_blogpost.md index 78ed1c21..af42ef7a 100644 --- a/checklists/templates/checklists/release_security_blogpost.md +++ b/checklists/templates/checklists/release_security_blogpost.md @@ -5,7 +5,7 @@ the Django team is issuing releases for These releases address the security issues detailed below. We encourage all users of Django to upgrade as soon as possible. {% for cve in cves %} -## {{cve.headline_for_blogpost }} +## {{ cve.headline_for_blogpost }} {{ cve.blogdescription|safe|default:cve.description }} {% if cve.reporter %} diff --git a/dashboard/templates/base_dashboard.html b/dashboard/templates/base_dashboard.html index 19773bd2..15d419ba 100644 --- a/dashboard/templates/base_dashboard.html +++ b/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 %}

Development dashboard

-{% endblock %} +{% endblock header %} {% block javascript %} -{% endblock %} +{% endblock javascript %} diff --git a/dashboard/templates/dashboard/detail.html b/dashboard/templates/dashboard/detail.html index 7484d964..2d08950d 100644 --- a/dashboard/templates/dashboard/detail.html +++ b/dashboard/templates/dashboard/detail.html @@ -11,10 +11,10 @@ {% translate "All metrics" %} -{% endblock %} +{% endblock content %} {% block javascript %} {{ block.super }} -{% endblock %} +{% endblock javascript %} diff --git a/dashboard/templates/dashboard/index.html b/dashboard/templates/dashboard/index.html index 276a1b01..8908f379 100644 --- a/dashboard/templates/dashboard/index.html +++ b/dashboard/templates/dashboard/index.html @@ -1,6 +1,5 @@ {% extends "base_dashboard.html" %} -{% load i18n %} -{% load static %} +{% load i18n static %} {% block content %}
@@ -23,10 +22,10 @@ {% blocktranslate with timestamp=data.0.latest.timestamp|timesince %}Updated {{ timestamp }} ago.{% endblocktranslate %}

-{% endblock %} +{% endblock content %} {% block javascript %} {{ block.super }} -{% endblock %} +{% endblock javascript %} diff --git a/djangoproject/templates/400.html b/djangoproject/templates/400.html index 0437552b..79fd91a2 100644 --- a/djangoproject/templates/400.html +++ b/djangoproject/templates/400.html @@ -9,4 +9,4 @@

{% translate "Bad request" %}

{% translate "Yikes, this was a bad request. Not sure why, but it sure was bad." %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/403.html b/djangoproject/templates/403.html index 77393a6d..caa65eab 100644 --- a/djangoproject/templates/403.html +++ b/djangoproject/templates/403.html @@ -9,4 +9,4 @@

{% translate "Permission denied" %}

{% translate "Apologies, but it seems as if you're not allowed to access this page. We honestly hope this is just a mistake." %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/404.html b/djangoproject/templates/404.html index c34e301e..2aded543 100644 --- a/djangoproject/templates/404.html +++ b/djangoproject/templates/404.html @@ -20,4 +20,4 @@ Here's a link to the homepage. You know, just in case. {% endblocktranslate %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/410.html b/djangoproject/templates/410.html index 2129e8b2..78b64460 100644 --- a/djangoproject/templates/410.html +++ b/djangoproject/templates/410.html @@ -23,4 +23,4 @@ {% endblocktranslate %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/500.html b/djangoproject/templates/500.html index a590f2be..602872a2 100644 --- a/djangoproject/templates/500.html +++ b/djangoproject/templates/500.html @@ -13,4 +13,4 @@

{% translate "We're messing around with things internally, and the server had a bit of a hiccup." %}

{% translate "Please try again later." %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/accounts/delete_profile.html b/djangoproject/templates/accounts/delete_profile.html index af917567..a84f41a0 100644 --- a/djangoproject/templates/accounts/delete_profile.html +++ b/djangoproject/templates/accounts/delete_profile.html @@ -37,4 +37,4 @@ {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/accounts/delete_profile_success.html b/djangoproject/templates/accounts/delete_profile_success.html index bb1bab64..09628020 100644 --- a/djangoproject/templates/accounts/delete_profile_success.html +++ b/djangoproject/templates/accounts/delete_profile_success.html @@ -13,4 +13,4 @@ around on our various community spaces, online and off. {% endblocktranslate %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/accounts/edit_profile.html b/djangoproject/templates/accounts/edit_profile.html index 29d5dfc2..9bd5803f 100644 --- a/djangoproject/templates/accounts/edit_profile.html +++ b/djangoproject/templates/accounts/edit_profile.html @@ -31,7 +31,7 @@ -{% endblock %} +{% endblock content %} {% block content-related %}
@@ -56,4 +56,4 @@

-{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/accounts/user_profile.html b/djangoproject/templates/accounts/user_profile.html index 1c89ed9e..69869999 100644 --- a/djangoproject/templates/accounts/user_profile.html +++ b/djangoproject/templates/accounts/user_profile.html @@ -30,7 +30,7 @@ -{% endblock %} +{% endblock content-related %} {% block content %}
@@ -54,7 +54,7 @@ {% endif %} - {% with user_obj.owned_feeds.all as feeds %} + {% with feeds=user_obj.owned_feeds.all %} {% if feeds %}

{% translate "Community feeds:" %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/aggregator/edit-feed.html b/djangoproject/templates/aggregator/edit-feed.html index 715531d4..b31e93e0 100644 --- a/djangoproject/templates/aggregator/edit-feed.html +++ b/djangoproject/templates/aggregator/edit-feed.html @@ -27,4 +27,4 @@ {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/aggregator/feeditem_list.html b/djangoproject/templates/aggregator/feeditem_list.html index e0a52075..971ac810 100644 --- a/djangoproject/templates/aggregator/feeditem_list.html +++ b/djangoproject/templates/aggregator/feeditem_list.html @@ -44,4 +44,4 @@
{% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/aggregator/index.html b/djangoproject/templates/aggregator/index.html index 709703e1..1b95e7a8 100644 --- a/djangoproject/templates/aggregator/index.html +++ b/djangoproject/templates/aggregator/index.html @@ -96,8 +96,8 @@ {% endfor %} -{% endblock %} +{% endblock content %} {% block content-related-extra %} {% top_corporate_members "diamond" "platinum" "gold" header="Diamond, Platinum and Gold Members" %} -{% endblock %} +{% endblock content-related-extra %} diff --git a/djangoproject/templates/aggregator/local-django-community.html b/djangoproject/templates/aggregator/local-django-community.html index b8de2eef..f9c606f0 100644 --- a/djangoproject/templates/aggregator/local-django-community.html +++ b/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 @@ {% if grouped_django_communities %}

{% translate "Table of contents" %}

{% endif %} {% for local_django_community in grouped_django_communities %} -
-

{{ local_django_community.grouper.title }}

+
+

{{ local_django_community.grouper.title }}

    {% for django_community in local_django_community.list %}
  • @@ -50,5 +50,4 @@ {% translate "Local Django communities are coming soon. Please check back later." %} {% endfor %} -{##} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/aggregator/my-feeds.html b/djangoproject/templates/aggregator/my-feeds.html index c266f82e..7a013f15 100644 --- a/djangoproject/templates/aggregator/my-feeds.html +++ b/djangoproject/templates/aggregator/my-feeds.html @@ -24,4 +24,4 @@ {#
  • Claim a feed already in the system.
    • #}
-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/base.html b/djangoproject/templates/base.html index d6860ff8..b4d7ac22 100644 --- a/djangoproject/templates/base.html +++ b/djangoproject/templates/base.html @@ -1,4 +1,4 @@ -{% load static banner %} +{% load banner static %} @@ -10,7 +10,7 @@ - {% block link_rel_tags %}{% endblock link_rel_tags %} + {% block link_rel_tags %}{% endblock %} @@ -23,12 +23,12 @@ + {% endspaceless %}{% endblock og_description %}" /> - + @@ -42,7 +42,7 @@ - {% block head_extra %}{% endblock head_extra %} + {% block head_extra %}{% endblock %} @@ -76,7 +76,7 @@ {% endfor %} {% endif %} - {% endblock %} + {% endblock messages %} {% block content %}{% endblock %} Back to Top @@ -92,7 +92,7 @@ {# Used to display urgent news, events, and alerts #} {% block alert %} - {% endblock %} + {% endblock alert %} @@ -104,7 +104,7 @@ {% block footer %} {% include "includes/footer.html" %} - {% endblock %} + {% endblock footer %} {% block javascript %} {# Require JS #} @@ -131,6 +131,6 @@ - {% endblock %} + {% endblock javascript %} diff --git a/djangoproject/templates/base_2col.html b/djangoproject/templates/base_2col.html index 3327c945..f335f0b5 100644 --- a/djangoproject/templates/base_2col.html +++ b/djangoproject/templates/base_2col.html @@ -3,12 +3,12 @@ {% block columnwrap %}
{% block content %} - {% endblock %} + {% endblock content %}
-{% endblock %} +{% endblock columnwrap %} diff --git a/djangoproject/templates/base_3col.html b/djangoproject/templates/base_3col.html index b2f20a39..769045cb 100644 --- a/djangoproject/templates/base_3col.html +++ b/djangoproject/templates/base_3col.html @@ -16,4 +16,4 @@ {% block content-extra %}{% endblock %}
-{% endblock %} +{% endblock columnwrap %} diff --git a/djangoproject/templates/base_code.html b/djangoproject/templates/base_code.html index abd7a23e..d30e1358 100644 --- a/djangoproject/templates/base_code.html +++ b/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 %}

Django source code

{% endblock %} diff --git a/djangoproject/templates/base_community.html b/djangoproject/templates/base_community.html index 7df7414a..4aee05ff 100644 --- a/djangoproject/templates/base_community.html +++ b/djangoproject/templates/base_community.html @@ -1,10 +1,12 @@ {% extends "base.html" %} -{% load fundraising_extras i18n hosts %} +{% load fundraising_extras hosts 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!" %}

-{% endblock %} +{% endblock header %} {% block content-related %}
@@ -66,4 +68,4 @@
{% translate "Download official logos" %}
-{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/base_foundation.html b/djangoproject/templates/base_foundation.html index 49904c1b..03c97e0a 100644 --- a/djangoproject/templates/base_foundation.html +++ b/djangoproject/templates/base_foundation.html @@ -1,14 +1,15 @@ {% extends "base.html" %} -{% load fundraising_extras meetings i18n hosts %} +{% load fundraising_extras hosts i18n meetings %} {% block og_title %}Django Software Foundation{% endblock %} {% block layout_class %}sidebar-right{% endblock %} + {% block title %}Django Software Foundation{% endblock %} {% block header %}

Django Software Foundation

-{% endblock %} +{% endblock header %} {% block content-related %} @@ -35,4 +36,4 @@ {% render_latest_meeting_minute_entries 2 %} {% translate "More meeting minutes" %} -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/base_weblog.html b/djangoproject/templates/base_weblog.html index 28e3f95e..4de3a1c3 100644 --- a/djangoproject/templates/base_weblog.html +++ b/djangoproject/templates/base_weblog.html @@ -1,6 +1,7 @@ {% extends "base.html" %} -{% load fundraising_extras i18n weblog hosts %} +{% load fundraising_extras hosts i18n weblog %} {% block layout_class %}sidebar-right{% endblock %} + {% block title %}{% translate "News & Events" %}{% endblock %} {% block og_title %}{% translate "News & Events" %}{% endblock %} @@ -9,11 +10,11 @@ {% if banner_is_title %}

{% else %}

{% endif %} {% translate "News & Events" %} {% if banner_is_title %}

{% else %}

{% endif %} -{% endblock %} +{% endblock header %} {% block head_extra %} -{% endblock %} +{% endblock head_extra %} {% block body_class %}blog{% endblock %} @@ -59,4 +60,4 @@
  • {% translate "Recent code changes" %}
    • -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/blog/entry_archive.html b/djangoproject/templates/blog/entry_archive.html index b1647094..590c4079 100644 --- a/djangoproject/templates/blog/entry_archive.html +++ b/djangoproject/templates/blog/entry_archive.html @@ -24,4 +24,4 @@ {% include 'blog/blog_pagination.html' %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/blog/entry_archive_day.html b/djangoproject/templates/blog/entry_archive_day.html index ef3696f1..681f4e91 100644 --- a/djangoproject/templates/blog/entry_archive_day.html +++ b/djangoproject/templates/blog/entry_archive_day.html @@ -19,4 +19,4 @@ {% include 'blog/blog_pagination.html' %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/blog/entry_archive_month.html b/djangoproject/templates/blog/entry_archive_month.html index c2df7b8e..9da340e1 100644 --- a/djangoproject/templates/blog/entry_archive_month.html +++ b/djangoproject/templates/blog/entry_archive_month.html @@ -19,4 +19,4 @@ {% include 'blog/blog_pagination.html' %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/blog/entry_archive_year.html b/djangoproject/templates/blog/entry_archive_year.html index 24af1dcb..924feb8f 100644 --- a/djangoproject/templates/blog/entry_archive_year.html +++ b/djangoproject/templates/blog/entry_archive_year.html @@ -19,4 +19,4 @@ {% include 'blog/blog_pagination.html' %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/blog/entry_detail.html b/djangoproject/templates/blog/entry_detail.html index ee52a31e..ec1ef73b 100644 --- a/djangoproject/templates/blog/entry_detail.html +++ b/djangoproject/templates/blog/entry_detail.html @@ -20,4 +20,4 @@ {% endblocktranslate %}
    {{ object.body_html|safe }}
    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html index 12ece55b..17348bdc 100644 --- a/djangoproject/templates/conduct/base.html +++ b/djangoproject/templates/conduct/base.html @@ -3,7 +3,7 @@ {% block header %}

    {% translate "Code of Conduct" %}

    -{% endblock %} +{% endblock header %} {% block content-related %}
    @@ -41,6 +41,6 @@ {% endblocktranslate %}

    -{% endblock %} +{% endblock content-related %} {% block title %}{% translate "Django Code of Conduct" %}{% endblock %} diff --git a/djangoproject/templates/conduct/changes.html b/djangoproject/templates/conduct/changes.html index e9668733..cd36b137 100644 --- a/djangoproject/templates/conduct/changes.html +++ b/djangoproject/templates/conduct/changes.html @@ -4,6 +4,7 @@ {% block title %}{% translate "Django Code of Conduct - Changes" %}{% endblock %} {% block og_title %}{% translate "Django Code of Conduct - Changes" %}{% endblock %} + {% block og_description %}{% translate "Changes to the Code of Conduct" %}{% endblock %} {% block content %} @@ -36,4 +37,4 @@ on GitHub.{% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html index 6db9cc17..6880168e 100644 --- a/djangoproject/templates/conduct/enforcement.html +++ b/djangoproject/templates/conduct/enforcement.html @@ -4,6 +4,7 @@ {% block title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %} {% block og_title %}{% translate "Django Code of Conduct - Enforcement Manual" %}{% endblock %} + {% block og_description %}{% translate "This is the enforcement manual followed by Django's Code of Conduct working group" %}{% endblock %} {% block content %} @@ -14,4 +15,4 @@ This manual has moved to GitHub. Please see the latest version there.{% endblocktranslate %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html index 4133c126..f387afd8 100644 --- a/djangoproject/templates/conduct/faq.html +++ b/djangoproject/templates/conduct/faq.html @@ -4,6 +4,7 @@ {% block title %}{% translate "Django Code of Conduct - FAQ" %}{% endblock %} {% block og_title %}{% translate "Django Code of Conduct - FAQ" %}{% endblock %} + {% block og_description %}{% translate "Common questions and concerns around the Django community's Code of Conduct" %}{% endblock %} {% block content %} @@ -240,7 +241,7 @@ whatever codes of conduct you want in the spaces that belong to you. Please honor this Code of Conduct in our spaces.{% endblocktranslate %}

    -{% endblock %} +{% endblock content %} {% block head_extra %} {{ block.super }} diff --git a/djangoproject/templates/conduct/index.html b/djangoproject/templates/conduct/index.html index 72c70d52..24c9b026 100644 --- a/djangoproject/templates/conduct/index.html +++ b/djangoproject/templates/conduct/index.html @@ -4,6 +4,7 @@ {% block title %}{% translate "Django Code of Conduct" %}{% endblock %} {% block og_title %}{% translate "Django Code of Conduct" %}{% endblock %} + {% block og_description %}{% translate "Some ground rules for the community" %}{% endblock %} {% block content %} @@ -558,4 +559,4 @@ {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html index 79ce06fc..1b810043 100644 --- a/djangoproject/templates/conduct/reporting.html +++ b/djangoproject/templates/conduct/reporting.html @@ -4,6 +4,7 @@ {% block title %}{% translate "Django Code of Conduct - Reporting Guide" %}{% endblock %} {% block og_title %}{% translate "Django Code of Conduct - Reporting Guide" %}{% endblock %} + {% block og_description %}{% translate "A guide to reporting issues in the community" %}{% endblock %} {% block content %} @@ -259,11 +260,11 @@

    {% translate "Conflicts of Interest" %} #

    - {% blocktrans trimmed %} + {% blocktranslate trimmed %} Any member of the working group must immediately notify the other members in writing (by disclosure on the report email thread) and recuse themselves from handling a report if they: - {% endblocktrans %} + {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_archive_day.html b/djangoproject/templates/foundation/meeting_archive_day.html index 0cdc2ce4..989df63b 100644 --- a/djangoproject/templates/foundation/meeting_archive_day.html +++ b/djangoproject/templates/foundation/meeting_archive_day.html @@ -2,8 +2,9 @@ {% load i18n %} {% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %} + {% block og_description %}{% blocktranslate trimmed with day=day|date:"DATE_FORMAT" %} - View meeting minutes for {{ day }}{% endblocktranslate %}{% endblock %} + View meeting minutes for {{ day }}{% endblocktranslate %}{% endblock og_description %} {% block content %}

    {% blocktranslate trimmed with day=day|date:"DATE_FORMAT" %} @@ -14,4 +15,4 @@
  • {{ meeting }}
    • {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_archive_month.html b/djangoproject/templates/foundation/meeting_archive_month.html index 9c8ac61c..720d921e 100644 --- a/djangoproject/templates/foundation/meeting_archive_month.html +++ b/djangoproject/templates/foundation/meeting_archive_month.html @@ -2,6 +2,7 @@ {% load i18n %} {% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %} + {% block og_description %}{% blocktranslate with month=month|date:"F, Y" %}View meeting minutes for {{ month }}{% endblocktranslate %}{% endblock %} {% block content %} @@ -12,4 +13,4 @@
  • {{ meeting }}
    • {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_archive_year.html b/djangoproject/templates/foundation/meeting_archive_year.html index b869455f..136cfd4c 100644 --- a/djangoproject/templates/foundation/meeting_archive_year.html +++ b/djangoproject/templates/foundation/meeting_archive_year.html @@ -2,6 +2,7 @@ {% load i18n %} {% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %} + {% block og_description %}{% blocktranslate with year=year|date:"Y" %}View meeting minutes for {{ year }}{% endblocktranslate %}{% endblock %} {% block content %} @@ -12,4 +13,4 @@
  • {{ meeting }}
    • {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_detail.html b/djangoproject/templates/foundation/meeting_detail.html index 8f767b8e..bbd67600 100644 --- a/djangoproject/templates/foundation/meeting_detail.html +++ b/djangoproject/templates/foundation/meeting_detail.html @@ -2,6 +2,7 @@ {% load i18n %} {% block og_title %}{% blocktranslate %}Meeting minutes: {{ meeting }}{% endblocktranslate %}{% endblock %} + {% block og_description %}{% blocktranslate %}Meeting minutes for {{ meeting }}{% endblocktranslate %}{% endblock %} {% block content %} @@ -103,4 +104,4 @@ {% endfor %} {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_snippet.html b/djangoproject/templates/foundation/meeting_snippet.html index 0e72198e..7d6e6f30 100644 --- a/djangoproject/templates/foundation/meeting_snippet.html +++ b/djangoproject/templates/foundation/meeting_snippet.html @@ -5,7 +5,7 @@

    {{ m }}

    - {% with m.business.all as businesses %} + {% with businesses=m.business.all %} {% if businesses %}
    {% translate "New and Ongoing business" %} diff --git a/djangoproject/templates/fundraising/index.html b/djangoproject/templates/fundraising/index.html index 6cc16d09..8595b684 100644 --- a/djangoproject/templates/fundraising/index.html +++ b/djangoproject/templates/fundraising/index.html @@ -1,10 +1,12 @@ {% extends 'base.html' %} -{% load fundraising_extras humanize i18n static hosts %} +{% load fundraising_extras hosts humanize i18n static %} {% block title %}{% translate "Support Django" %}{% endblock %} + {% block layout_class %}full-width{% endblock %} {% block og_title %}{% translate "Support Django" %}{% endblock %} + {% block og_description %}{% translate "Support Django development by donating to the Django Software Foundation" %}{% endblock %} {% block header %} @@ -13,7 +15,7 @@ Support Django development by donating to the Django Software Foundation. {% endblocktranslate %}

    -{% endblock %} +{% endblock header %} {% block billboard %}{% endblock %} @@ -26,7 +28,7 @@
    {% endif %} -{% endblock %} +{% endblock messages %} {% block content %} @@ -247,7 +249,7 @@ {% display_django_heroes %}
    -{% endblock %} +{% endblock content %} {% block content-extra %}
    @@ -349,4 +351,4 @@

    -{% endblock %} +{% endblock content-extra %} diff --git a/djangoproject/templates/fundraising/manage-donations.html b/djangoproject/templates/fundraising/manage-donations.html index 8812087b..b7b23fd1 100644 --- a/djangoproject/templates/fundraising/manage-donations.html +++ b/djangoproject/templates/fundraising/manage-donations.html @@ -10,7 +10,7 @@ {% endif %} -{% endblock %} +{% endblock messages %} {% block content %} @@ -83,6 +83,6 @@ {% endfor %} {% endif %} -{% endblock %} +{% endblock content %} {% block content-extra %}{% endblock %} diff --git a/djangoproject/templates/fundraising/thank-you.html b/djangoproject/templates/fundraising/thank-you.html index 2c0a2518..af7a7b76 100644 --- a/djangoproject/templates/fundraising/thank-you.html +++ b/djangoproject/templates/fundraising/thank-you.html @@ -41,6 +41,6 @@ {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} {% block content-extra %}{% endblock %} diff --git a/djangoproject/templates/homepage.html b/djangoproject/templates/homepage.html index 23375bb4..1019c6df 100644 --- a/djangoproject/templates/homepage.html +++ b/djangoproject/templates/homepage.html @@ -1,8 +1,10 @@ {% extends "base_3col.html" %} -{% load fundraising_extras i18n weblog hosts %} +{% load fundraising_extras hosts i18n weblog %} {% block sectionid %}homepage{% endblock %} + {% block body_class %}homepage{% endblock %} + {% block layout_class %}column-container sidebar-right{% endblock %} {% block header %} @@ -12,7 +14,7 @@

    {% translate "Get started with Django" %}

    -{% endblock %} +{% endblock header %} {% block content %}
    @@ -100,7 +102,7 @@ {% endcomment %} -{% endblock %} +{% endblock content %} {% block content-related %}

    {% translate "Additional Information" %}

    @@ -192,7 +194,7 @@ {% endcomment %}
    -{% endblock %} +{% endblock content-related %} {% block alert %} {% comment %} @@ -211,4 +213,4 @@ {% endcomment %} -{% endblock %} +{% endblock alert %} diff --git a/djangoproject/templates/members/corporate_member_badges.html b/djangoproject/templates/members/corporate_member_badges.html index b4268a3a..1c8a5d3b 100644 --- a/djangoproject/templates/members/corporate_member_badges.html +++ b/djangoproject/templates/members/corporate_member_badges.html @@ -49,4 +49,4 @@ {% endfor %} {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/corporate_members_join_thanks.html b/djangoproject/templates/members/corporate_members_join_thanks.html index a63138aa..b5cddae1 100644 --- a/djangoproject/templates/members/corporate_members_join_thanks.html +++ b/djangoproject/templates/members/corporate_members_join_thanks.html @@ -9,4 +9,4 @@ response from the board after our next monthly meeting. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/corporatemember_form.html b/djangoproject/templates/members/corporatemember_form.html index e3c35518..69d27b5e 100644 --- a/djangoproject/templates/members/corporatemember_form.html +++ b/djangoproject/templates/members/corporatemember_form.html @@ -14,7 +14,7 @@ {% csrf_token %} {% for field in form %}
    - {% if field.name in form.label_fields %} + {% if field.name in form.label_fields %} {{ field.label }}: {{ field }} {% else %} {{ field }} @@ -25,4 +25,4 @@ {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/corporatemember_list.html b/djangoproject/templates/members/corporatemember_list.html index 513e58a9..c5dab30d 100644 --- a/djangoproject/templates/members/corporatemember_list.html +++ b/djangoproject/templates/members/corporatemember_list.html @@ -1,7 +1,8 @@ {% extends "base_foundation.html" %} -{% load humanize i18n hosts %} +{% load hosts humanize i18n %} {% block og_title %}{% translate "Corporate members" %}{% endblock %} + {% block og_description %}{% translate "The following organizations are corporate members of the Django Software Foundation." %}{% endblock %} {% block content %} @@ -66,4 +67,4 @@ {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/individualmember_list.html b/djangoproject/templates/members/individualmember_list.html index 95d1769c..8868b932 100644 --- a/djangoproject/templates/members/individualmember_list.html +++ b/djangoproject/templates/members/individualmember_list.html @@ -91,4 +91,4 @@ {% endfor %} {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/team_list.html b/djangoproject/templates/members/team_list.html index 5f06a4cd..541e9307 100644 --- a/djangoproject/templates/members/team_list.html +++ b/djangoproject/templates/members/team_list.html @@ -2,6 +2,7 @@ {% load i18n %} {% block og_title %}{% translate "Meet the Teams | Django Software Foundation" %}{% endblock %} + {% block og_description %}{% spaceless %} {% blocktranslate trimmed %} Get to know the teams behind the Django Software Foundation, @@ -9,13 +10,13 @@ their roles and responsibilities in advancing the development and adoption of the Django web framework. {% endblocktranslate %} -{% endspaceless %}{% endblock %} +{% endspaceless %}{% endblock og_description %} {% block content %}

    {% translate "Teams" %}

    - {% url 'document-detail' lang='en' version='dev' url='internals/organization' host 'docs' as organization_url %} + {% url 'document-detail' lang='en' version='dev' url='internals/organization' host 'docs' as organization_url %} {% blocktranslate trimmed %} The following teams are groups of people who support the Django project and the Django Software Foundation. Apart from the Django Fellows, who @@ -43,4 +44,4 @@

    {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/overview.html b/djangoproject/templates/overview.html index b8c90316..76b32c81 100644 --- a/djangoproject/templates/overview.html +++ b/djangoproject/templates/overview.html @@ -2,7 +2,9 @@ {% load i18n %} {% block title %}{% translate "Django overview" %}{% endblock %} + {% block layout_class %}full-width{% endblock %} + {% block og_title %}{% translate "Django overview" %}{% endblock %} {% block header %} @@ -12,7 +14,7 @@ requirements of experienced web developers. {% endblocktranslate %}

    -{% endblock %} +{% endblock header %} {% block content %}

    {% translate "Why Django?" %}

    @@ -80,7 +82,7 @@
    {% translate "Get started with Django" %}
    -{% endblock %} +{% endblock content %} {% block content-related %} @@ -116,7 +118,7 @@ {% endcomment %} -{% endblock %} +{% endblock content-related %} {% block content-extra %} @@ -137,4 +139,4 @@ -{% endblock %} +{% endblock content-extra %} diff --git a/djangoproject/templates/registration/activate.html b/djangoproject/templates/registration/activate.html index b11ec992..d525ebc2 100644 --- a/djangoproject/templates/registration/activate.html +++ b/djangoproject/templates/registration/activate.html @@ -11,4 +11,4 @@ the activation key for your account has expired; activation keys are only valid for {{ days }} days after registration. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/registration/activation_complete.html b/djangoproject/templates/registration/activation_complete.html index 27eab6d8..1991768c 100644 --- a/djangoproject/templates/registration/activation_complete.html +++ b/djangoproject/templates/registration/activation_complete.html @@ -11,4 +11,4 @@ Thanks for signing up! Now you can log in. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/registration/base.html b/djangoproject/templates/registration/base.html index 60c13d94..ff6e29db 100644 --- a/djangoproject/templates/registration/base.html +++ b/djangoproject/templates/registration/base.html @@ -1,4 +1,5 @@ {% extends "base_2col.html" %} {% load i18n %} {% block sectionid %}community{% endblock %} + {% block header %}

    {% translate "Accounts" %}

    {% endblock %} diff --git a/djangoproject/templates/registration/logged_out.html b/djangoproject/templates/registration/logged_out.html index 55659c0e..899e3e70 100644 --- a/djangoproject/templates/registration/logged_out.html +++ b/djangoproject/templates/registration/logged_out.html @@ -11,4 +11,4 @@ Thanks for stopping by; when you come back, don't forget to log in again. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/registration/login.html b/djangoproject/templates/registration/login.html index d33eb5e2..3a812a53 100644 --- a/djangoproject/templates/registration/login.html +++ b/djangoproject/templates/registration/login.html @@ -2,7 +2,9 @@ {% load i18n %} {% block title %}{% translate "Log in" %}{% endblock %} + {% block og_title %}{% translate "Log in" %}{% endblock %} + {% block og_description %}{% translate "Log in to your account" %}{% endblock %} {% block content %} @@ -37,7 +39,7 @@

    -{% endblock %} +{% endblock content %} {% block content-related %}
    @@ -57,4 +59,4 @@ {% endblocktranslate %}

    -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/registration/password_reset_email.html b/djangoproject/templates/registration/password_reset_email.html index b5026d42..351bcdc3 100644 --- a/djangoproject/templates/registration/password_reset_email.html +++ b/djangoproject/templates/registration/password_reset_email.html @@ -6,7 +6,7 @@ {% translate "Please go to the following page and choose a new password:" %} {% block reset_link %} {% url 'password_reset_confirm' uidb64=uid token=token %} - {% endblock %} + {% endblock reset_link %} {% translate "Your username, in case you've forgotten:" %} {{ user.username }} {% translate "Thanks for using our site!" %} diff --git a/djangoproject/templates/registration/registration_complete.html b/djangoproject/templates/registration/registration_complete.html index b1b1deea..258f4291 100644 --- a/djangoproject/templates/registration/registration_complete.html +++ b/djangoproject/templates/registration/registration_complete.html @@ -11,4 +11,4 @@ for activating your account. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/registration/registration_form.html b/djangoproject/templates/registration/registration_form.html index 0d8e9659..e8eb38a4 100644 --- a/djangoproject/templates/registration/registration_form.html +++ b/djangoproject/templates/registration/registration_form.html @@ -45,7 +45,7 @@

    -{% endblock %} +{% endblock content %} {% block content-related %}
    @@ -79,4 +79,4 @@ {% endblocktranslate %}

    -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/releases/download.html b/djangoproject/templates/releases/download.html index 4167d345..81903850 100644 --- a/djangoproject/templates/releases/download.html +++ b/djangoproject/templates/releases/download.html @@ -2,19 +2,28 @@ {% load fundraising_extras release_notes static %} {% block sectionid %}download{% endblock %} + {% block title %}Download Django{% endblock %} + {% block layout_class %}sidebar-right{% endblock %} {% block og_title %}Download Django{% endblock %} + {% block og_image %}{% static "img/release-roadmap.svg" %}{% endblock %} + {% block og_image_alt %}Django's release roadmap{% endblock %} + {% block og_description %}The latest official version is {{ current.version }}{% if current.is_lts %} (LTS){% endif %}{% endblock %} + {% block og_image_width %}1030{% endblock %} + {% block og_image_height %}480{% endblock %} + {% block og_image_type %}image/svg+xml{% endblock %} + {% block header %}

    Download

    -{% endblock %} +{% endblock header %} {% block content %}

    How to get Django

    @@ -35,7 +44,7 @@ 
    py -m pip install Django=={{ current.version }}
    {% if preview %} - {% with preview.version|slice:":3" as major_version %} + {% with major_version=preview.version|slice:":3" %}

    Option {% cycle options %}: Get the {{ preview.get_status_display }} for {{ major_version }}

    As part of the @@ -272,7 +281,7 @@ [3] Last version to support Python 2.7.

    -{% endblock %} +{% endblock content %} {% block content-related %} @@ -323,4 +332,4 @@ -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/releases/roadmap.html b/djangoproject/templates/releases/roadmap.html index 20214392..f5ab96e9 100644 --- a/djangoproject/templates/releases/roadmap.html +++ b/djangoproject/templates/releases/roadmap.html @@ -2,12 +2,14 @@ {% load date_format fundraising_extras hosts %} {% block sectionid %}roadmap{% endblock %} + {% block title %}Django {{ series }} Roadmap{% endblock %} + {% block layout_class %}sidebar-right{% endblock %} {% block header %}

    Download

    -{% endblock %} +{% endblock header %} {% block content %}

    Django {{ series }} Roadmap

    @@ -116,11 +118,11 @@ -{% endblock %} +{% endblock content %} {% block content-related %}

    Additional Information

    {% donation_snippet %}
    -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/start.html b/djangoproject/templates/start.html index b14663d4..5acc69f1 100644 --- a/djangoproject/templates/start.html +++ b/djangoproject/templates/start.html @@ -2,8 +2,11 @@ {% load docs i18n %} {% block layout_class %}full-width{% endblock %} + {% block title %}{% translate "Getting started with Django" %}{% endblock %} + {% block og_title %}{% translate "Getting started with Django" %}{% endblock %} + {% block og_description %}{% translate "It's quick & easy to get up and running with Django" %}{% endblock %} {% block header %} @@ -17,7 +20,7 @@     -{% endblock %} +{% endblock header %} {% block content %} @@ -345,4 +348,4 @@ def homepage(request): -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/styleguide.html b/djangoproject/templates/styleguide.html index 7c7eb018..cc11a6a7 100644 --- a/djangoproject/templates/styleguide.html +++ b/djangoproject/templates/styleguide.html @@ -1,6 +1,7 @@ {% extends "base.html" %} {% block title %}Django Web Styleguide{% endblock %} + {% block body_class %}styleguide{% endblock %} {% block header %}

    Style Guide

    {% endblock %} @@ -408,7 +409,7 @@ -{% endblock %} +{% endblock content %} {% block content-related %} {# Always include

    label and
    with aria role. #}
    @@ -445,4 +446,4 @@
    -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/tracdb/bouncing_tickets.html b/djangoproject/templates/tracdb/bouncing_tickets.html index 0988a467..a0610451 100644 --- a/djangoproject/templates/tracdb/bouncing_tickets.html +++ b/djangoproject/templates/tracdb/bouncing_tickets.html @@ -30,4 +30,4 @@ -{% endblock %} +{% endblock content %} diff --git a/docs/templates/base_docs.html b/docs/templates/base_docs.html index 82d6a3a7..d4484cb2 100644 --- a/docs/templates/base_docs.html +++ b/docs/templates/base_docs.html @@ -3,14 +3,14 @@ {% block html_language_code %}{{ lang|default:"en" }}{% endblock %} -{% block title %}{% trans 'Django Documentation' %}{% endblock %} +{% block title %}{% translate 'Django Documentation' %}{% endblock %} {% block header-classes %} container--flex container--flex--wrap--mobile -{% endblock %} +{% endblock header-classes %} {% block header %} -

    {% trans 'Documentation' %}

    -{% endblock %} +

    {% translate 'Documentation' %}

    +{% endblock header %} {% block layout_class %}sidebar-right{% endblock %} diff --git a/docs/templates/docs/doc.html b/docs/templates/docs/doc.html index 8bce6c2f..73655fd4 100644 --- a/docs/templates/docs/doc.html +++ b/docs/templates/docs/doc.html @@ -1,8 +1,9 @@ {% extends "base_docs.html" %} -{% load i18n fundraising_extras docs %} +{% load docs fundraising_extras i18n %} -{% block title %}{{ doc.title|striptags|safe }} | {% trans "Django documentation" %}{% endblock %} -{% block og_title %}{{ doc.title|striptags }} | {% trans "Django documentation" %}{% endblock %} +{% block title %}{{ doc.title|striptags|safe }} | {% translate "Django documentation" %}{% endblock %} + +{% block og_title %}{{ doc.title|striptags }} | {% translate "Django documentation" %}{% endblock %} {% block doc_url %}{% url 'document-index' lang=lang version=version host 'docs' %}{% endblock %} @@ -31,23 +32,23 @@ + title="{% translate "Django documentation" %}"> {% endblock link_rel_tags %} {% block before_header %} {% if release.is_dev %} {% if "internals" not in docurl %}{# The dev version is canonical for internals/. #}
    - {% trans "This document is for Django's development version, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page." %} + {% translate "This document is for Django's development version, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page." %}
    {% endif %} {% elif release.is_preview %}
    - {% trans "This document is for a preview release of Django, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page." %} + {% translate "This document is for a preview release of Django, which can be significantly different from previous releases. For older releases, use the version selector floating in the bottom right corner of this page." %}
    {% elif not release.is_supported %}
    - {% trans "This document is for an insecure version of Django that is no longer supported. Please upgrade to a newer release!" %} + {% translate "This document is for an insecure version of Django that is no longer supported. Please upgrade to a newer release!" %}
    {% endif %} {% endblock before_header %} @@ -57,13 +58,13 @@
    • - +
      • {% for available_lang in available_languages reversed %} {% if lang != available_lang %} @@ -82,7 +83,7 @@ {% get_all_doc_versions docurl as other_versions %}
      • -
        • @@ -126,7 +127,6 @@ {% endblock content %} - {% block content-related %}

        {% translate "Additional Information" %}

        @@ -134,7 +134,7 @@ {% donation_snippet %} {% block toc-wrapper %} -

        {% trans "Contents" %}

        +

        {% translate "Contents" %}

        {% block toc %} {{ doc.toc|safe }} {% endblock toc %} @@ -142,16 +142,16 @@ {% block browse-wrapper %}