From f1b699a55ac127dc3526381976971e14c9f39b14 Mon Sep 17 00:00:00 2001 From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> Date: Fri, 28 Nov 2025 14:57:06 +0100 Subject: [PATCH 1/2] Updated CoC as WG rather than committee and linked to team page. --- djangoproject/templates/conduct/base.html | 2 +- djangoproject/templates/conduct/changes.html | 2 +- .../templates/conduct/enforcement.html | 83 ++++++++++--------- .../templates/conduct/reporting.html | 21 ++--- 4 files changed, 55 insertions(+), 53 deletions(-) diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html index b7eaf1c390..19f980eba1 100644 --- a/djangoproject/templates/conduct/base.html +++ b/djangoproject/templates/conduct/base.html @@ -11,7 +11,7 @@

{% translate "Django Community Code of Conduct" %}

diff --git a/djangoproject/templates/aggregator/index.html b/djangoproject/templates/aggregator/index.html index 461fed46b5..527351e443 100644 --- a/djangoproject/templates/aggregator/index.html +++ b/djangoproject/templates/aggregator/index.html @@ -39,7 +39,7 @@

{% translate "Package Ecosystem" %}

{% translate "Get Involved" %}

- +
{% include "svg_logos/bug.html" %} @@ -47,7 +47,7 @@

{% translate "Get Involved" %}

{% translate "Report an issue" %}

- +
{% include "svg_logos/notepad.html" %} diff --git a/djangoproject/templates/base_community.html b/djangoproject/templates/base_community.html index fa76161a11..848fad59a0 100644 --- a/djangoproject/templates/base_community.html +++ b/djangoproject/templates/base_community.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load fundraising_extras i18n %} +{% load fundraising_extras i18n hosts %} {% block og_title %}{% translate "Django Community" %}{% endblock %} {% block og_description %}{% translate "Building the Django Community. Come join us!" %}{% endblock %} @@ -45,7 +45,7 @@

{% translate "Dive In" %}

diff --git a/djangoproject/templates/base_foundation.html b/djangoproject/templates/base_foundation.html index 3925eb316c..e178749093 100644 --- a/djangoproject/templates/base_foundation.html +++ b/djangoproject/templates/base_foundation.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load fundraising_extras meetings i18n %} +{% load fundraising_extras meetings i18n hosts %} {% block og_title %}Django Software Foundation{% endblock %} @@ -19,11 +19,11 @@

{% translate "Additional Informatio

About the foundation

{% translate "Latest DSF meeting minutes" %}

{% translate "The minutes from May 2025 onwards are stored in the repo" %} diff --git a/djangoproject/templates/base_weblog.html b/djangoproject/templates/base_weblog.html index dc672dc2a3..08c975e719 100644 --- a/djangoproject/templates/base_weblog.html +++ b/djangoproject/templates/base_weblog.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load fundraising_extras i18n weblog %} +{% load fundraising_extras i18n weblog hosts %} {% block layout_class %}sidebar-right{% endblock %} {% block title %}{% translate "News & Events" %}{% endblock %} @@ -34,7 +34,7 @@

{% translate "Upcoming Events" %}

{% endfor %} {% endif %} -

{% translate "Want your event listed here?" %}

+

{% translate "Want your event listed here?" %}

{% comment %} {# tags not implemented in backend yet #} diff --git a/djangoproject/templates/fundraising/index.html b/djangoproject/templates/fundraising/index.html index c470f15537..fe3d19e428 100644 --- a/djangoproject/templates/fundraising/index.html +++ b/djangoproject/templates/fundraising/index.html @@ -1,5 +1,5 @@ {% extends 'base.html' %} -{% load fundraising_extras humanize i18n static %} +{% load fundraising_extras humanize i18n static hosts %} {% block title %}{% translate "Support Django" %}{% endblock %} {% block layout_class %}full-width{% endblock %} @@ -42,8 +42,9 @@

{% translate "Other ways to give" %}

  • {% translate "Sponsor Django via GitHub Sponsors" %}.
  • + {% url 'fundraising:index' as fundraising_url %} {% blocktranslate trimmed %} - Benevity Workplace Giving + Benevity Workplace Giving Program - If your employer participates, you can make donations to the DSF via payroll deduction. {% endblocktranslate %} @@ -89,7 +90,7 @@

    {% translate "Why give to the Django Software Foundation?" %}<

    {% blocktranslate trimmed %} - Still curious? See our Frequently Asked Questions + Still curious? See our Frequently Asked Questions about donations. {% endblocktranslate %}

    @@ -118,12 +119,13 @@

    {% translate "Django Fellowship Program" %}

    + {% host_url 'homepage' host 'www' as base_url %} {% blocktranslate trimmed %} For more details, you can read retrospectives for the - first three + first three months of the program, - 2015, and - 2016. + 2015, and + 2016. {% endblocktranslate %}

    @@ -144,7 +146,7 @@

    {% translate "Django Fellowship Program" %}

    {% blocktranslate trimmed %} If you use Django on a daily basis and care about the development of Django - itself, you should donate today (may be tax deductible). + itself, you should donate today (may be tax deductible). Only with your support can we make sure that the web framework you base your work on can grow to be even better in the coming years. {% endblocktranslate %} @@ -249,15 +251,16 @@

    {% translate "DSF Supporters" %}

    {% translate "What is the Django Software Foundation?" %}

    + {% host_url 'homepage' host 'www' as base_url %}

    {% blocktranslate trimmed %} Development of Django is supported by an independent foundation established as a 501(c)(3) non-profit. Like most open-source foundations, - the goal of the Django Software Foundation + the goal of the Django Software Foundation is to promote, support, and advance the Django web framework. If you're interested in how the Django Software Foundation supports the Django web framework, we published a - + Summary of 2014. {% endblocktranslate %} @@ -274,7 +277,7 @@

    {% translate "Who are the Django Fellows?" % team since 2021 and a core committer to Python projects such as music21, pylint, and Arches. Jacob - + began as a full-time Fellow in August 2025. {% endblocktranslate %}

    @@ -285,7 +288,7 @@

    {% translate "Who are the Django Fellows?" % (2024-present) - an active community member, co-creator of Djangonaut Space and a member of Django's review and triage team since 2023. Sarah - + began as a full-time Fellow in April 2024. {% endblocktranslate %}

    @@ -297,7 +300,7 @@

    {% translate "Who are the Django Fellows?" % experience in architecting, building, and maintaining scalable web services, as well as leading new feature design and development. Natalia - + began as a part-time Fellow in April 2023. {% endblocktranslate %}

    diff --git a/djangoproject/templates/homepage.html b/djangoproject/templates/homepage.html index 3b1ad6b62e..23375bb473 100644 --- a/djangoproject/templates/homepage.html +++ b/djangoproject/templates/homepage.html @@ -1,5 +1,5 @@ {% extends "base_3col.html" %} -{% load fundraising_extras i18n weblog %} +{% load fundraising_extras i18n weblog hosts %} {% block sectionid %}homepage{% endblock %} {% block body_class %}homepage{% endblock %} @@ -141,7 +141,7 @@

    {% translate "Get involved" %}

    {% translate "Report bugs and make feature requests" %}
    -
    {% translate "Development dashboard" %}
    +
    {% translate "Development dashboard" %}
    {% translate "see what's currently being worked on" %}
    @@ -163,20 +163,20 @@

    {% translate "Get Help" %}

    {% translate "The Django Software Foundation" %}

    - {% translate "More about the DSF" %} + {% translate "More about the DSF" %} {% comment %}

    Upcoming Events

    @@ -82,9 +82,9 @@

    Support Us

    & andrevv
  • diff --git a/djangoproject/templates/members/corporate_member_badges.html b/djangoproject/templates/members/corporate_member_badges.html index 5751065609..b4268a3abe 100644 --- a/djangoproject/templates/members/corporate_member_badges.html +++ b/djangoproject/templates/members/corporate_member_badges.html @@ -30,8 +30,9 @@ {% block content %}

    {% translate "Corporate member badges" %}

    + {% url 'members:corporate-members' as corporate_members_url %} {% blocktranslate trimmed %} - Corporate members of the Django Software Foundation may display + Corporate members of the Django Software Foundation may display these badges on their site to show their support. {% endblocktranslate %}

    diff --git a/djangoproject/templates/members/corporatemember_list.html b/djangoproject/templates/members/corporatemember_list.html index 6085ca1877..513e58a954 100644 --- a/djangoproject/templates/members/corporatemember_list.html +++ b/djangoproject/templates/members/corporatemember_list.html @@ -1,5 +1,5 @@ {% extends "base_foundation.html" %} -{% load humanize i18n %} +{% load humanize i18n hosts %} {% block og_title %}{% translate "Corporate members" %}{% endblock %} {% block og_description %}{% translate "The following organizations are corporate members of the Django Software Foundation." %}{% endblock %} @@ -7,10 +7,11 @@ {% block content %}

    {% translate "Corporate members" %}

    + {% host_url 'homepage' host 'www' as base_url %} {% blocktranslate trimmed %} The following organizations are corporate members of the Django Software Foundation. If you are interested in becoming a corporate member of the - DSF, you can find out more on our + DSF, you can find out more on our corporate membership page. {% endblocktranslate %}

    diff --git a/djangoproject/templates/members/team_list.html b/djangoproject/templates/members/team_list.html index acb43e4f59..5f06a4cd7b 100644 --- a/djangoproject/templates/members/team_list.html +++ b/djangoproject/templates/members/team_list.html @@ -15,6 +15,7 @@

    {% translate "Teams" %}

    + {% 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 @@ -24,7 +25,7 @@

    {% translate "Teams" %}

    individuals with elevated permissions rather than formal teams. For an overview of how the Django Project is organized and the principles that guide it, see the - + organization and principles page. {% endblocktranslate %} diff --git a/djangoproject/templates/releases/download.html b/djangoproject/templates/releases/download.html index 21d31c81a2..52c8355ccc 100644 --- a/djangoproject/templates/releases/download.html +++ b/djangoproject/templates/releases/download.html @@ -71,7 +71,7 @@

    Supported Versions

    Certain feature releases will be designated as long-term support (LTS) releases. These releases will get security and data loss fixes applied for a guaranteed period of time, typically three years.

    -

    See the +

    See the supported versions policy for detailed guidelines about what fixes will be backported.

    Django release roadmap diff --git a/djangoproject/templates/releases/roadmap.html b/djangoproject/templates/releases/roadmap.html index 42095cbe77..20214392c5 100644 --- a/djangoproject/templates/releases/roadmap.html +++ b/djangoproject/templates/releases/roadmap.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load date_format fundraising_extras %} +{% load date_format fundraising_extras hosts %} {% block sectionid %}roadmap{% endblock %} {% block title %}Django {{ series }} Roadmap{% endblock %} @@ -21,11 +21,11 @@

    What features will be in Django {{ series }}?

    that miss the deadline won't.

    If you have a major feature you'd like to contribute, please propose it on new feature ideas GitHub project and review the - requesting features documentation.

    + requesting features documentation.

    Minor features and bug fixes will be merged as they are completed. If you have submitted a patch, ensure the flags on the Trac ticket are correct so it appears in the "Patches needing review" filter of the - Django Development Dashboard. + Django Development Dashboard. Better yet, find someone to review your patch and mark the ticket as "Ready for checkin". Tickets marked "Ready for checkin" are regularly reviewed by mergers.

    @@ -35,9 +35,9 @@

    What features will be in Django {{ series }}?

    How you can help

    Community effort is key. You can help by: