Skip to content

Update committees urls #2308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+27 −20
Open

Update committees urls #2308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15e0aec
update : replace hardcoded committes url with teams template url
pgaca Oct 31, 2025
8f3ed82
update : include anchor into variable
pgaca Oct 31, 2025
8b3fceb
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion djangoproject/templates/conduct/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link
Contributor

@sarahboyce sarahboyce Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<li><a href="{% url 'members:teams' %}#code-of-conduct-team">{% translate "Committee" %}</a></li>
<li><a href="{% url 'members:teams' %}#code-of-conduct-team">{% translate "Code of Conduct working group" %}</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>
Expand Down
14 changes: 9 additions & 5 deletions djangoproject/templates/conduct/enforcement.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ <h2 class="deck">

<h3>{% translate "The Code of Conduct Committee" %}</h3>

<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").
{% endblocktranslate %}</p>

{% 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>
{% endwith %}
Comment on lines +24 to +30
Copy link
Contributor

@sarahboyce sarahboyce Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{% 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>
{% endwith %}
<p>
{% blocktranslate trimmed %}
All responses to reports of conduct violations will be managed by the
<a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct working group</a>.
{% endblocktranslate %}</p>

Personally I wouldn't bother with the use of add and save an indent/extra logic here


<p>
{% blocktranslate trimmed %}
Expand Down
19 changes: 11 additions & 8 deletions djangoproject/templates/conduct/reporting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,17 @@ <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>

<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>
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>
{% 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>
{% endwith %}
Comment on lines +115 to +124
Copy link
Contributor

@sarahboyce sarahboyce Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{% 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>
{% endwith %}
<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 working group. Their e-mail addresses are
listed on the <a href="{{ teams_url }}#code-of-conduct-team">Code of Conduct working group</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>

Their e-mail addresses are listed on the...

This is actually not true of the teams page. Is this still true that this is a way to report? (cc @jefftriplett )


<p>
{% blocktranslate trimmed %}
Expand Down
4 changes: 2 additions & 2 deletions locale/en/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=\"{coc_teams_url}\">Code of Conduct Committee</a> (\"the "
Copy link
Contributor

@sarahboyce sarahboyce Nov 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like more translation file updates are required, however, I don't think we use the translations on the website so I'm not sure we are keeping this up-to-date (maybe @marksweb can clarify here?)

"committee\")."
msgstr ""

Expand Down Expand Up @@ -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=\"{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."
Expand Down
8 changes: 4 additions & 4 deletions locale/sv/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=\"{coc_teams_url}\">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=\"{coc_teams_url}"
"\">uppförandekoden</a> kommer att hanteras av en <a href=\"/foundation/"
"committees/\">uppförandekodskommitté</a> (\"kommittén\")."

Expand Down Expand Up @@ -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=\"{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=\"/foundation/committees/"
"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 "
Expand Down