diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 459df85f16..08c3a4596f 100644 --- a/.pre-commit-config.yaml +++ b/.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"] diff --git a/dashboard/templates/base_dashboard.html b/dashboard/templates/base_dashboard.html index 19773bd20f..15d419ba67 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 7484d964c8..2d08950dda 100644 --- a/dashboard/templates/dashboard/detail.html +++ b/dashboard/templates/dashboard/detail.html @@ -11,10 +11,10 @@

{{ metric }}

{% 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 276a1b0107..8908f379ea 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 @@

{{ report.metric.name }}

{% 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 0437552b64..79fd91a25c 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 77393a6da2..caa65eabaf 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 c34e301e7e..2aded54348 100644 --- a/djangoproject/templates/404.html +++ b/djangoproject/templates/404.html @@ -20,4 +20,4 @@

{% translate "Page not found" %}

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 2129e8b211..78b6446077 100644 --- a/djangoproject/templates/410.html +++ b/djangoproject/templates/410.html @@ -23,4 +23,4 @@

{% translate "Page removed." %}

{% endblocktranslate %}

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

{% translate "Page unavailable" %}

{% 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 af9175673a..a84f41a009 100644 --- a/djangoproject/templates/accounts/delete_profile.html +++ b/djangoproject/templates/accounts/delete_profile.html @@ -37,4 +37,4 @@

{% translate "Are you sure?" %}

{% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/accounts/delete_profile_success.html b/djangoproject/templates/accounts/delete_profile_success.html index bb1bab64ab..096280203f 100644 --- a/djangoproject/templates/accounts/delete_profile_success.html +++ b/djangoproject/templates/accounts/delete_profile_success.html @@ -13,4 +13,4 @@

{% translate "Account deleted" %}

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 29d5dfc2d9..9bd5803f6e 100644 --- a/djangoproject/templates/accounts/edit_profile.html +++ b/djangoproject/templates/accounts/edit_profile.html @@ -31,7 +31,7 @@

{% translate "Edit your profile" %}

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

{% translate "Help" %}

-{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/accounts/user_profile.html b/djangoproject/templates/accounts/user_profile.html index 1c89ed9eab..698699992b 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 @@

{% translate "Statistics on Django core contributions:" %}

{% 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 715531d4e4..b31e93e0a0 100644 --- a/djangoproject/templates/aggregator/edit-feed.html +++ b/djangoproject/templates/aggregator/edit-feed.html @@ -27,4 +27,4 @@

{% blocktranslate %}Edit {{ feed }}:{% endblocktranslate %}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/aggregator/feeditem_list.html b/djangoproject/templates/aggregator/feeditem_list.html index e0a5207571..971ac81017 100644 --- a/djangoproject/templates/aggregator/feeditem_list.html +++ b/djangoproject/templates/aggregator/feeditem_list.html @@ -44,4 +44,4 @@

{{ item.title }}

{% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/aggregator/index.html b/djangoproject/templates/aggregator/index.html index 461fed46b5..ab8749f515 100644 --- a/djangoproject/templates/aggregator/index.html +++ b/djangoproject/templates/aggregator/index.html @@ -96,4 +96,4 @@

{{ feedtype.name }} {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/aggregator/local-django-community.html b/djangoproject/templates/aggregator/local-django-community.html index b8de2eeff4..f9c606f011 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 @@

{% translate "Local Django Communities" %}

{% 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 }}

-{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/base.html b/djangoproject/templates/base.html index 915d1bfaa5..d4be098743 100644 --- a/djangoproject/templates/base.html +++ b/djangoproject/templates/base.html @@ -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 %} @@ -75,7 +75,7 @@ {% endfor %} {% endif %} - {% endblock %} + {% endblock messages %} {% block content %}{% endblock %} Back to Top @@ -91,7 +91,7 @@ {# Used to display urgent news, events, and alerts #} {% block alert %} - {% endblock %} + {% endblock alert %} @@ -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 @@ - {% endblock %} + {% endblock javascript %} diff --git a/djangoproject/templates/base_2col.html b/djangoproject/templates/base_2col.html index 3327c9454b..f335f0b590 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 b2f20a39cb..769045cbee 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 abd7a23e9f..d30e1358b7 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 fa76161a11..2bd676c128 100644 --- a/djangoproject/templates/base_community.html +++ b/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!" %}

-{% endblock %} +{% endblock header %} {% block content-related %}
@@ -63,4 +65,4 @@

{% translate "More Links" %}

{% translate "Download official logos" %}
-{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/base_foundation.html b/djangoproject/templates/base_foundation.html index 3925eb316c..5f6b03e246 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 %} +{% 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 %}

Django Software Foundation

-{% endblock %} +{% endblock header %} {% block content-related %} @@ -32,4 +33,4 @@

{% translate "Latest DSF meeting minutes" %}

{% 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 dc672dc2a3..d18eb06508 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 %} {% 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 %} @@ -57,4 +58,4 @@

{% translate "RSS Feeds" %}

  • {% 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 b1647094ea..590c407953 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 f30add4ede..21d6c7c4ec 100644 --- a/djangoproject/templates/blog/entry_archive_day.html +++ b/djangoproject/templates/blog/entry_archive_day.html @@ -19,4 +19,4 @@

    {% blocktranslate %}{{ day|date:"MONTH_DAY_FORMAT" }} archive{% endblocktran {% 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 939d2e7045..83ca3d5445 100644 --- a/djangoproject/templates/blog/entry_archive_month.html +++ b/djangoproject/templates/blog/entry_archive_month.html @@ -19,4 +19,4 @@

    {% blocktranslate %}{{ month|date:"YEAR_MONTH_FORMAT" }} archive{% endblockt {% 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 24af1dcbb1..924feb8f52 100644 --- a/djangoproject/templates/blog/entry_archive_year.html +++ b/djangoproject/templates/blog/entry_archive_year.html @@ -19,4 +19,4 @@

    {{ year|date:"Y" }} {% translate "archive" %}

    {% 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 ee52a31eab..ec1ef73b12 100644 --- a/djangoproject/templates/blog/entry_detail.html +++ b/djangoproject/templates/blog/entry_detail.html @@ -20,4 +20,4 @@

    {{ object.headline|safe }}

    {% endblocktranslate %}
    {{ object.body_html|safe }}
    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html index b7eaf1c390..21ca0ccbb1 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 %}
    @@ -32,6 +32,6 @@

    {% translate "License" %}

    -{% 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 a954aa8147..caf99114e2 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 %} @@ -59,4 +60,4 @@

    {% translate "Changelog" %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html index 414d1b39a9..05d1d778f1 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 Committee" %}{% endblock %} {% block content %} @@ -164,7 +165,7 @@

    {% translate "Resolutions" %}

    {% endblocktranslate %}

    {% translate "Conflicts of Interest" %}

    - {% url 'conduct_reporting' as url%} + {% url 'conduct_reporting' as url %}

    {% blocktranslate trimmed %} In the event of any conflict of interest a committee member must immediately @@ -191,4 +192,4 @@

    {% translate "Conflicts of Interest" %}

    and ideals.{% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html index 71cd1803eb..433c3eb193 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 %} @@ -130,7 +131,7 @@

    {% blocktranslate %}This is censorship! I have the right to 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 52ebf30fb4..76b29b7917 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 %} @@ -137,4 +138,4 @@

    {% translate "Questions?" %}

    contact us. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html index 277978481c..291a07d1e0 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 %} @@ -136,4 +137,4 @@

    {% translate "Reconsideration" %}

    foundation@djangoproject.com with your request and motivation and the DSF board will review the case.{% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/contact/foundation.html b/djangoproject/templates/contact/foundation.html index ea5374122f..381225fa77 100644 --- a/djangoproject/templates/contact/foundation.html +++ b/djangoproject/templates/contact/foundation.html @@ -48,4 +48,4 @@

    {% translate "Contact the Django Software Foundation" %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/contact/sent.html b/djangoproject/templates/contact/sent.html index 9cc57be474..73b485fa94 100644 --- a/djangoproject/templates/contact/sent.html +++ b/djangoproject/templates/contact/sent.html @@ -20,4 +20,4 @@

    {% translate "Your message has been sent; thanks!" %}

    it's an emergency. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/diversity/base.html b/djangoproject/templates/diversity/base.html index a61f4eba53..a9172d2280 100644 --- a/djangoproject/templates/diversity/base.html +++ b/djangoproject/templates/diversity/base.html @@ -2,11 +2,12 @@ {% load i18n %} {% block og_title %}{% translate "Django Community Diversity Statement" %}{% endblock %} + {% block og_description %}{% translate "We welcome you." %}{% endblock %} {% block header %}

    {% translate "Community Diversity Statement" %}

    -{% endblock %} +{% endblock header %} {% block content-related %}
    @@ -31,6 +32,6 @@

    {% translate "License" %}

    -{% endblock %} +{% endblock content-related %} {% block title %}{% translate "Django Community Diversity Statement" %}{% endblock %} diff --git a/djangoproject/templates/diversity/changes.html b/djangoproject/templates/diversity/changes.html index 4f8c54285d..937b23e97f 100644 --- a/djangoproject/templates/diversity/changes.html +++ b/djangoproject/templates/diversity/changes.html @@ -2,6 +2,7 @@ {% load date_format i18n %} {% block title %}{% translate "Django Community Diversity Statement - Changes" %}{% endblock %} + {% block og_title %}{% translate "Django Community Diversity Statement - Changes" %}{% endblock %} {% block content %} @@ -45,4 +46,4 @@

    {% translate "Changelog" %}

    {% translate "Initial release" %}. -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/diversity/index.html b/djangoproject/templates/diversity/index.html index d5d9c1c673..8f5171c56f 100644 --- a/djangoproject/templates/diversity/index.html +++ b/djangoproject/templates/diversity/index.html @@ -109,4 +109,4 @@

    {% translate "Questions?" %}

    contact us. {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/flatfiles/default.html b/djangoproject/templates/flatfiles/default.html index a3bf8e94ac..e909d63f33 100644 --- a/djangoproject/templates/flatfiles/default.html +++ b/djangoproject/templates/flatfiles/default.html @@ -4,4 +4,4 @@

    {{ flatpage.title }}

    {{ flatpage.content }} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/flatfiles/overview.html b/djangoproject/templates/flatfiles/overview.html index c68a5abeaf..b5a67d56aa 100644 --- a/djangoproject/templates/flatfiles/overview.html +++ b/djangoproject/templates/flatfiles/overview.html @@ -4,4 +4,4 @@

    {{ flatpage.title }}

    {{ flatpage.content }} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/flatpages/code.html b/djangoproject/templates/flatpages/code.html index 0b0c7be3be..8b17673aa1 100644 --- a/djangoproject/templates/flatpages/code.html +++ b/djangoproject/templates/flatpages/code.html @@ -6,4 +6,4 @@

    {{ flatpage.title }}

    {{ flatpage.content }} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/flatpages/community.html b/djangoproject/templates/flatpages/community.html index d58f96ee73..1b2bfb7943 100644 --- a/djangoproject/templates/flatpages/community.html +++ b/djangoproject/templates/flatpages/community.html @@ -6,4 +6,4 @@

    {{ flatpage.title }}

    {{ flatpage.content }} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/flatpages/default.html b/djangoproject/templates/flatpages/default.html index 15b177012f..c27d56a3dd 100644 --- a/djangoproject/templates/flatpages/default.html +++ b/djangoproject/templates/flatpages/default.html @@ -8,8 +8,8 @@ {% block header %}

    {{ flatpage.title }}

    -{% endblock %} +{% endblock header %} {% block content %} {{ flatpage.content }} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/flatpages/foundation.html b/djangoproject/templates/flatpages/foundation.html index e1a3b864e7..b54eba4066 100644 --- a/djangoproject/templates/flatpages/foundation.html +++ b/djangoproject/templates/flatpages/foundation.html @@ -7,4 +7,4 @@ {% block content %}

    {{ flatpage.title }}

    {{ flatpage.content }} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/coreawardcohort_list.html b/djangoproject/templates/foundation/coreawardcohort_list.html index 66979a8882..b6fb0fcfb6 100644 --- a/djangoproject/templates/foundation/coreawardcohort_list.html +++ b/djangoproject/templates/foundation/coreawardcohort_list.html @@ -2,6 +2,7 @@ {% load i18n %} {% block og_title %}{% translate "Django Core Developers" %}{% endblock %} + {% block og_description %}{% translate "Former Django Core Team dissolved on March 12, 2020." %}{% endblock %} {% block content %} @@ -21,10 +22,10 @@

    {{ cohort }}

    {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_archive.html b/djangoproject/templates/foundation/meeting_archive.html index bf69e9b848..8e3cfc609c 100644 --- a/djangoproject/templates/foundation/meeting_archive.html +++ b/djangoproject/templates/foundation/meeting_archive.html @@ -2,11 +2,12 @@ {% load i18n %} {% block og_title %}{% translate "Meeting minutes archive" %}{% endblock %} + {% block og_description %}{% translate "View meeting minutes" %}{% endblock %} {% block head_extra %} -{% endblock %} +{% endblock head_extra %} {% block content %}

    {% translate "Meeting minutes archive" %}

    @@ -22,4 +23,4 @@

    {% translate "Meeting minutes archive" %}

  • {{ year.year }}
    • {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_archive_day.html b/djangoproject/templates/foundation/meeting_archive_day.html index 0cdc2ce431..989df63b03 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 @@

    {% blocktranslate trimmed with day=day|date:"DATE_FORMAT" %}
  • {{ meeting }}
    • {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_archive_month.html b/djangoproject/templates/foundation/meeting_archive_month.html index 9c8ac61c3e..720d921eec 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 @@

    {% blocktranslate with month=month|date:"F, Y" %}Meeting minutes archive: {{
  • {{ meeting }}
    • {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_archive_year.html b/djangoproject/templates/foundation/meeting_archive_year.html index b869455fa9..136cfd4cd5 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 @@

    {% blocktranslate with year=year|date:"Y" %}Meeting minutes archive: {{ year
  • {{ meeting }}
    • {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_detail.html b/djangoproject/templates/foundation/meeting_detail.html index 8f767b8e85..bbd67600ac 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 @@

    {% translate "Action items" %}

    {% endfor %} {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/foundation/meeting_snippet.html b/djangoproject/templates/foundation/meeting_snippet.html index 0e72198eb0..7d6e6f302d 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 c470f15537..565e71d725 100644 --- a/djangoproject/templates/fundraising/index.html +++ b/djangoproject/templates/fundraising/index.html @@ -2,9 +2,11 @@ {% load fundraising_extras 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 messages %} @@ -24,7 +26,7 @@

    {{ message }}

    {% endif %} -{% endblock %} +{% endblock messages %} {% block content %} @@ -243,7 +245,7 @@

    {% translate "DSF Supporters" %}

    {% display_django_heroes %}
    -{% endblock %} +{% endblock content %} {% block content-extra %}
    @@ -344,4 +346,4 @@

    {% translate "Former Django Fellows:" %}

    -{% endblock %} +{% endblock content-extra %} diff --git a/djangoproject/templates/fundraising/manage-donations.html b/djangoproject/templates/fundraising/manage-donations.html index 8812087b87..b7b23fd184 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 @@

    {% translate "Your past donations" %}

    {% 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 2c0a2518b5..af7a7b76ee 100644 --- a/djangoproject/templates/fundraising/thank-you.html +++ b/djangoproject/templates/fundraising/thank-you.html @@ -41,6 +41,6 @@

    {% translate "Thank you for supporting the Django Project!" %}

    {% endblocktranslate %}

    -{% endblock %} +{% endblock content %} {% block content-extra %}{% endblock %} diff --git a/djangoproject/templates/homepage.html b/djangoproject/templates/homepage.html index 3b1ad6b62e..d3f231ee5e 100644 --- a/djangoproject/templates/homepage.html +++ b/djangoproject/templates/homepage.html @@ -2,7 +2,9 @@ {% load fundraising_extras 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 @@

    Upcoming Events

    {% endcomment %}
    -{% endblock %} +{% endblock content-related %} {% block alert %} {% comment %} @@ -211,4 +213,4 @@

    Upcoming Events

    {% endcomment %} -{% endblock %} +{% endblock alert %} diff --git a/djangoproject/templates/members/corporate_member_badges.html b/djangoproject/templates/members/corporate_member_badges.html index 5751065609..a78d74a901 100644 --- a/djangoproject/templates/members/corporate_member_badges.html +++ b/djangoproject/templates/members/corporate_member_badges.html @@ -48,4 +48,4 @@

    {{ level|title }}

    {% 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 a63138aaf7..b5cddae1c8 100644 --- a/djangoproject/templates/members/corporate_members_join_thanks.html +++ b/djangoproject/templates/members/corporate_members_join_thanks.html @@ -9,4 +9,4 @@

    {% translate "Corporate membership application submitted." %}

    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 e3c35518c9..69d27b5ea2 100644 --- a/djangoproject/templates/members/corporatemember_form.html +++ b/djangoproject/templates/members/corporatemember_form.html @@ -14,7 +14,7 @@

    {% translate "Become a DSF corporate member" %}

    {% 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 @@

    {% translate "Become a DSF corporate member" %}

    {% endfor %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/corporatemember_list.html b/djangoproject/templates/members/corporatemember_list.html index 6085ca1877..fd506d9126 100644 --- a/djangoproject/templates/members/corporatemember_list.html +++ b/djangoproject/templates/members/corporatemember_list.html @@ -2,6 +2,7 @@ {% load 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 %} @@ -65,4 +66,4 @@

    {% blocktranslate trimmed with amount=corporate_membership_amounts.bronze|in {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/individualmember_list.html b/djangoproject/templates/members/individualmember_list.html index 95d1769cee..8868b9327f 100644 --- a/djangoproject/templates/members/individualmember_list.html +++ b/djangoproject/templates/members/individualmember_list.html @@ -91,4 +91,4 @@

    {% translate "Former members" %}

    {% endfor %} {% endif %} -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/members/team_list.html b/djangoproject/templates/members/team_list.html index acb43e4f59..2504b7cf3c 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,7 +10,7 @@ their roles and responsibilities in advancing the development and adoption of the Django web framework. {% endblocktranslate %} -{% endspaceless %}{% endblock %} +{% endspaceless %}{% endblock og_description %} {% block content %} @@ -42,4 +43,4 @@

    {{ team.name }}experienced web developers. {% endblocktranslate %}

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

    {% translate "Why Django?" %}

    @@ -80,7 +82,7 @@

    {% translate "Why Django?" %}

    {% 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 @@

    {% translate "Sites Using Django" %}

    -{% endblock %} +{% endblock content-extra %} diff --git a/djangoproject/templates/registration/activate.html b/djangoproject/templates/registration/activate.html index b11ec9927c..d525ebc29c 100644 --- a/djangoproject/templates/registration/activate.html +++ b/djangoproject/templates/registration/activate.html @@ -11,4 +11,4 @@

    {% translate "Account activation failed." %}

    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 27eab6d8ea..1991768c5a 100644 --- a/djangoproject/templates/registration/activation_complete.html +++ b/djangoproject/templates/registration/activation_complete.html @@ -11,4 +11,4 @@

    {% translate "Account activated." %}

    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 60c13d94e5..ff6e29db52 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 55659c0ea2..899e3e70d2 100644 --- a/djangoproject/templates/registration/logged_out.html +++ b/djangoproject/templates/registration/logged_out.html @@ -11,4 +11,4 @@

    {% translate "You've been logged out." %}

    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 d33eb5e2d3..3a812a5341 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 @@

    {% translate "Log in" %}

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

    {% translate "Additional Informatio {% endblocktranslate %}

    -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/registration/password_reset_email.html b/djangoproject/templates/registration/password_reset_email.html index b5026d4279..351bcdc3d8 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 b1b1deea1a..258f42910d 100644 --- a/djangoproject/templates/registration/registration_complete.html +++ b/djangoproject/templates/registration/registration_complete.html @@ -11,4 +11,4 @@

    {% translate "Check your email" %}

    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 b0c7ac19c4..c71b3ff876 100644 --- a/djangoproject/templates/registration/registration_form.html +++ b/djangoproject/templates/registration/registration_form.html @@ -52,7 +52,7 @@

    {% translate "Create an account" %}

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

    {% translate "Help" %}

    {% endblocktranslate %}

    -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/releases/download.html b/djangoproject/templates/releases/download.html index f6c4fd3064..d60be48fe2 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 @@

    Option {% cycle '1' '2' '3' as options %}: Get the latest official versionpy -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 @@

    Unsupported previous releases

    [3] Last version to support Python 2.7.

    -{% endblock %} +{% endblock content %} {% block content-related %} @@ -323,4 +332,4 @@

    Unsupported previous releases (no longer receive security updates or bug fix -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/releases/roadmap.html b/djangoproject/templates/releases/roadmap.html index 42095cbe77..b589029f91 100644 --- a/djangoproject/templates/releases/roadmap.html +++ b/djangoproject/templates/releases/roadmap.html @@ -2,12 +2,14 @@ {% load date_format fundraising_extras %} {% 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 @@

    Final

    -{% 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 b14663d446..5acc69f191 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 @@

    {% translate "Security" %}

    -{% endblock %} +{% endblock content %} diff --git a/djangoproject/templates/styleguide.html b/djangoproject/templates/styleguide.html index 7c7eb018be..cc11a6a769 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 @@

    List section

    -{% endblock %} +{% endblock content %} {% block content-related %} {# Always include

    label and
    with aria role. #}
    @@ -445,4 +446,4 @@

    Contents

    -{% endblock %} +{% endblock content-related %} diff --git a/djangoproject/templates/tracdb/bouncing_tickets.html b/djangoproject/templates/tracdb/bouncing_tickets.html index 0988a46767..a06104518e 100644 --- a/djangoproject/templates/tracdb/bouncing_tickets.html +++ b/djangoproject/templates/tracdb/bouncing_tickets.html @@ -30,4 +30,4 @@

    {% translate "Tickets that have been repeatedly reopened." %} -{% endblock %} +{% endblock content %} diff --git a/docs/templates/base_docs.html b/docs/templates/base_docs.html index 82d6a3a739..d4484cb268 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 69694a6d83..a14b998767 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 body_extra %} {% 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 body_extra %} @@ -57,13 +58,13 @@
    • - +
      • {% for available_lang in available_languages %} {% 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 @@

        {% translate "Additional Informatio {% donation_snippet %} {% block toc-wrapper %} -

        {% trans "Contents" %}

        +

        {% translate "Contents" %}

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

        {% trans "Contents" %}

        {% block browse-wrapper %}