From 15e0aec7339e5628fa4aeb85e3c6e0932174e03c Mon Sep 17 00:00:00 2001
From: pgaca <pablo.garcia-campos@univ-grenoble-alpes.fr>
Date: Fri, 31 Oct 2025 11:10:15 +0100
Subject: [PATCH 1/3] update : replace hardcoded committes url with teams
 template url

---
 djangoproject/templates/conduct/base.html        | 2 +-
 djangoproject/templates/conduct/enforcement.html | 4 +++-
 djangoproject/templates/conduct/reporting.html   | 3 ++-
 locale/en/LC_MESSAGES/django.po                  | 4 ++--
 locale/sv/LC_MESSAGES/django.po                  | 8 ++++----
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/djangoproject/templates/conduct/base.html b/djangoproject/templates/conduct/base.html
index b7eaf1c390..37d491d9dc 100644
--- a/djangoproject/templates/conduct/base.html
+++ b/djangoproject/templates/conduct/base.html
@@ -11,7 +11,7 @@ <h2 id="aside-header">{% translate "Django Community Code of Conduct" %}</h2>
 
     <ul class="list-links">
       <li><a href="{% url 'code_of_conduct' %}">{% translate "Code of Conduct" %}</a></li>
-      <li><a href="/foundation/committees/#conduct">{% translate "Committee" %}</a></li>
+      <li><a href="{% url 'members:teams' %}#code-of-conduct-team">{% translate "Committee" %}</a></li>
       <li><a href="{% url 'conduct_faq' %}">{% translate "Frequently Asked Questions" %}</a></li>
       <li><a href="{% url 'conduct_reporting' %}">{% translate "Reporting Guide" %}</a></li>
       <li><a href="{% url 'conduct_enforcement' %}">{% translate "Enforcement Manual" %}</a></li>
diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html
index 414d1b39a9..90158e250d 100644
--- a/djangoproject/templates/conduct/enforcement.html
+++ b/djangoproject/templates/conduct/enforcement.html
@@ -19,10 +19,12 @@ <h2 class="deck">
 
   <h3>{% translate "The Code of Conduct Committee" %}</h3>
 
+
+  {% url 'members:teams' as teams_url %}
   <p>
     {% blocktranslate trimmed %}
       All responses to reports of conduct violations will be managed by a
-      <a href="/foundation/committees/">Code of Conduct Committee</a> ("the committee").
+      <a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct Committee</a> ("the committee").
     {% endblocktranslate %}</p>
 
   <p>
diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html
index 277978481c..77984f3944 100644
--- a/djangoproject/templates/conduct/reporting.html
+++ b/djangoproject/templates/conduct/reporting.html
@@ -111,11 +111,12 @@ <h3>{% translate "What if your report concerns a possible violation by a committ
       may not feel comfortable sending your report to the committee, as all members will
       see the report.{% endblocktranslate %}</p>
 
+  {% url 'members:teams' as teams_url %}
   <p>
     {% blocktranslate trimmed %}
       In that case, you can make a report directly to any or all of the current
       (vice/co) chairs of the Code of Conduct committee. Their e-mail addresses are
-      listed on the <a href="/foundation/committees/">Code of Conduct Committee</a>
+      listed on the <a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct Committee</a>
       page. The chairs will follow the usual enforcement process with the other
       members, but will exclude the member(s) that the report concerns from any
       discussion or decision making.{% endblocktranslate %}</p>
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index df08a14c81..da66df2a95 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -717,7 +717,7 @@ msgstr ""
 
 msgid ""
 "All responses to reports of conduct violations will be managed by a <a "
-"href=\"/foundation/committees/\">Code of Conduct Committee</a> (\"the "
+"href=\"{teams_url}#code-of-conduct-team\">Code of Conduct Committee</a> (\"the "
 "committee\")."
 msgstr ""
 
@@ -1326,7 +1326,7 @@ msgstr ""
 msgid ""
 "In that case, you can make a report directly to any or all of the current "
 "(vice/co) chairs of the Code of Conduct committee. Their e-mail addresses "
-"are listed on the <a href=\"/foundation/committees/\">Code of Conduct "
+"are listed on the <a href=\"{teams_url}#code-of-conduct-team\">Code of Conduct "
 "Committee</a> page. The chairs will follow the usual enforcement process "
 "with the other members, but will exclude the member(s) that the report "
 "concerns from any discussion or decision making."
diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po
index 655fe370d4..be7806e463 100644
--- a/locale/sv/LC_MESSAGES/django.po
+++ b/locale/sv/LC_MESSAGES/django.po
@@ -820,10 +820,10 @@ msgstr "Kommittén för uppförandekoden"
 
 msgid ""
 "All responses to reports of conduct violations will be managed by a <a "
-"href=\"/foundation/committees/\">Code of Conduct Committee</a> (\"the "
+"href=\"{teams_url}#code-of-conduct-team\">Code of Conduct Committee</a> (\"the "
 "committee\")."
 msgstr ""
-"Alla svar på rapporter om överträdelser av <a href=\"/foundation/committees/"
+"Alla svar på rapporter om överträdelser av <a href=\"{teams_url}#code-of-conduct-team"
 "\">uppförandekoden</a> kommer att hanteras av en <a href=\"/foundation/"
 "committees/\">uppförandekodskommitté</a> (\"kommittén\")."
 
@@ -1718,14 +1718,14 @@ msgstr ""
 msgid ""
 "In that case, you can make a report directly to any or all of the current "
 "(vice/co) chairs of the Code of Conduct committee. Their e-mail addresses "
-"are listed on the <a href=\"/foundation/committees/\">Code of Conduct "
+"are listed on the <a href=\"{teams_url}#code-of-conduct-team\">Code of Conduct "
 "Committee</a> page. The chairs will follow the usual enforcement process "
 "with the other members, but will exclude the member(s) that the report "
 "concerns from any discussion or decision making."
 msgstr ""
 "I så fall kan du göra en anmälan direkt till någon eller några av de "
 "nuvarande (vice/co) ordförandena i uppförandekodskommittén. Deras e-"
-"postadresser finns på sidan <a href=\"/foundation/committees/"
+"postadresser finns på sidan <a href=\"{teams_url}#code-of-conduct-team"
 "\">Uppförandekodskommittén</a>. Ordförandena kommer att följa den vanliga "
 "verkställighetsprocessen med de andra medlemmarna, men kommer att utesluta "
 "den eller de medlemmar som rapporten gäller från alla diskussioner eller "

From 8f3ed82f395e53a39584562efcf0d7332022d4ff Mon Sep 17 00:00:00 2001
From: pgaca <pablo.garcia-campos@univ-grenoble-alpes.fr>
Date: Fri, 31 Oct 2025 11:28:36 +0100
Subject: [PATCH 2/3] update : include anchor into variable

---
 djangoproject/templates/conduct/enforcement.html | 4 +++-
 djangoproject/templates/conduct/reporting.html   | 4 +++-
 locale/en/LC_MESSAGES/django.po                  | 4 ++--
 locale/sv/LC_MESSAGES/django.po                  | 8 ++++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html
index 90158e250d..1cc71570e5 100644
--- a/djangoproject/templates/conduct/enforcement.html
+++ b/djangoproject/templates/conduct/enforcement.html
@@ -21,11 +21,13 @@ <h3>{% translate "The Code of Conduct Committee" %}</h3>
 
 
   {% url 'members:teams' as teams_url %}
+  {% with coc_teams_url=teams_url|add:'#code-of-conduct-team' %}
   <p>
     {% blocktranslate trimmed %}
       All responses to reports of conduct violations will be managed by a
-      <a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct Committee</a> ("the committee").
+      <a href="{{ coc_teams_url }}">Code of Conduct Committee</a> ("the committee").
     {% endblocktranslate %}</p>
+  {% endwith %}
 
   <p>
     {% blocktranslate trimmed %}
diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html
index 77984f3944..5d8313412f 100644
--- a/djangoproject/templates/conduct/reporting.html
+++ b/djangoproject/templates/conduct/reporting.html
@@ -112,14 +112,16 @@ <h3>{% translate "What if your report concerns a possible violation by a committ
       see the report.{% endblocktranslate %}</p>
 
   {% url 'members:teams' as teams_url %}
+  {% with coc_teams_url=teams_url|add:'#code-of-conduct-team' %}
   <p>
     {% blocktranslate trimmed %}
       In that case, you can make a report directly to any or all of the current
       (vice/co) chairs of the Code of Conduct committee. Their e-mail addresses are
-      listed on the <a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct Committee</a>
+      listed on the <a href="{{ coc_teams_url }}">Code of Conduct Committee</a>
       page. The chairs will follow the usual enforcement process with the other
       members, but will exclude the member(s) that the report concerns from any
       discussion or decision making.{% endblocktranslate %}</p>
+  {% endwith %}
 
   <p>
     {% blocktranslate trimmed %}
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index da66df2a95..6b99818f64 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -717,7 +717,7 @@ msgstr ""
 
 msgid ""
 "All responses to reports of conduct violations will be managed by a <a "
-"href=\"{teams_url}#code-of-conduct-team\">Code of Conduct Committee</a> (\"the "
+"href=\"{coc_teams_url}\">Code of Conduct Committee</a> (\"the "
 "committee\")."
 msgstr ""
 
@@ -1326,7 +1326,7 @@ msgstr ""
 msgid ""
 "In that case, you can make a report directly to any or all of the current "
 "(vice/co) chairs of the Code of Conduct committee. Their e-mail addresses "
-"are listed on the <a href=\"{teams_url}#code-of-conduct-team\">Code of Conduct "
+"are listed on the <a href=\"{coc_teams_url}\">Code of Conduct "
 "Committee</a> page. The chairs will follow the usual enforcement process "
 "with the other members, but will exclude the member(s) that the report "
 "concerns from any discussion or decision making."
diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po
index be7806e463..3e30bd41ae 100644
--- a/locale/sv/LC_MESSAGES/django.po
+++ b/locale/sv/LC_MESSAGES/django.po
@@ -820,10 +820,10 @@ msgstr "Kommittén för uppförandekoden"
 
 msgid ""
 "All responses to reports of conduct violations will be managed by a <a "
-"href=\"{teams_url}#code-of-conduct-team\">Code of Conduct Committee</a> (\"the "
+"href=\"{coc_teams_url}\">Code of Conduct Committee</a> (\"the "
 "committee\")."
 msgstr ""
-"Alla svar på rapporter om överträdelser av <a href=\"{teams_url}#code-of-conduct-team"
+"Alla svar på rapporter om överträdelser av <a href=\"{coc_teams_url}"
 "\">uppförandekoden</a> kommer att hanteras av en <a href=\"/foundation/"
 "committees/\">uppförandekodskommitté</a> (\"kommittén\")."
 
@@ -1718,14 +1718,14 @@ msgstr ""
 msgid ""
 "In that case, you can make a report directly to any or all of the current "
 "(vice/co) chairs of the Code of Conduct committee. Their e-mail addresses "
-"are listed on the <a href=\"{teams_url}#code-of-conduct-team\">Code of Conduct "
+"are listed on the <a href=\"{coc_teams_url}\">Code of Conduct "
 "Committee</a> page. The chairs will follow the usual enforcement process "
 "with the other members, but will exclude the member(s) that the report "
 "concerns from any discussion or decision making."
 msgstr ""
 "I så fall kan du göra en anmälan direkt till någon eller några av de "
 "nuvarande (vice/co) ordförandena i uppförandekodskommittén. Deras e-"
-"postadresser finns på sidan <a href=\"{teams_url}#code-of-conduct-team"
+"postadresser finns på sidan <a href=\"{coc_teams_url}"
 "\">Uppförandekodskommittén</a>. Ordförandena kommer att följa den vanliga "
 "verkställighetsprocessen med de andra medlemmarna, men kommer att utesluta "
 "den eller de medlemmar som rapporten gäller från alla diskussioner eller "

From 8b3fceba81983558f8266d26ea373ddd6bf611ba Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Fri, 31 Oct 2025 11:10:31 +0000
Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 djangoproject/templates/conduct/enforcement.html | 10 +++++-----
 djangoproject/templates/conduct/reporting.html   | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html
index 1cc71570e5..7f74c6d20e 100644
--- a/djangoproject/templates/conduct/enforcement.html
+++ b/djangoproject/templates/conduct/enforcement.html
@@ -22,11 +22,11 @@ <h3>{% translate "The Code of Conduct Committee" %}</h3>
 
   {% url 'members:teams' as teams_url %}
   {% with coc_teams_url=teams_url|add:'#code-of-conduct-team' %}
-  <p>
-    {% blocktranslate trimmed %}
-      All responses to reports of conduct violations will be managed by a
-      <a href="{{ coc_teams_url }}">Code of Conduct Committee</a> ("the committee").
-    {% endblocktranslate %}</p>
+    <p>
+      {% blocktranslate trimmed %}
+        All responses to reports of conduct violations will be managed by a
+        <a href="{{ coc_teams_url }}">Code of Conduct Committee</a> ("the committee").
+      {% endblocktranslate %}</p>
   {% endwith %}
 
   <p>
diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html
index 5d8313412f..881f42ef4a 100644
--- a/djangoproject/templates/conduct/reporting.html
+++ b/djangoproject/templates/conduct/reporting.html
@@ -113,14 +113,14 @@ <h3>{% translate "What if your report concerns a possible violation by a committ
 
   {% url 'members:teams' as teams_url %}
   {% with coc_teams_url=teams_url|add:'#code-of-conduct-team' %}
-  <p>
-    {% blocktranslate trimmed %}
-      In that case, you can make a report directly to any or all of the current
-      (vice/co) chairs of the Code of Conduct committee. Their e-mail addresses are
-      listed on the <a href="{{ coc_teams_url }}">Code of Conduct Committee</a>
-      page. The chairs will follow the usual enforcement process with the other
-      members, but will exclude the member(s) that the report concerns from any
-      discussion or decision making.{% endblocktranslate %}</p>
+    <p>
+      {% blocktranslate trimmed %}
+        In that case, you can make a report directly to any or all of the current
+        (vice/co) chairs of the Code of Conduct committee. Their e-mail addresses are
+        listed on the <a href="{{ coc_teams_url }}">Code of Conduct Committee</a>
+        page. The chairs will follow the usual enforcement process with the other
+        members, but will exclude the member(s) that the report concerns from any
+        discussion or decision making.{% endblocktranslate %}</p>
   {% endwith %}
 
   <p>