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 @@
- {% blocktranslate trimmed %} - All responses to reports of conduct violations will be managed by a - Code of Conduct Committee ("the committee"). - {% endblocktranslate %}
+ + {% url 'members:teams' as teams_url %} + {% with coc_teams_url=teams_url|add:'#code-of-conduct-team' %} ++ {% blocktranslate trimmed %} + All responses to reports of conduct violations will be managed by a + Code of Conduct Committee ("the committee"). + {% endblocktranslate %}
+ {% endwith %}{% blocktranslate trimmed %} diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html index 277978481c..881f42ef4a 100644 --- a/djangoproject/templates/conduct/reporting.html +++ b/djangoproject/templates/conduct/reporting.html @@ -111,14 +111,17 @@
- {% 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 Code of Conduct Committee - 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 %}
+ {% url 'members:teams' as teams_url %} + {% with coc_teams_url=teams_url|add:'#code-of-conduct-team' %} ++ {% 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 Code of Conduct Committee + 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 %}
+ {% endwith %}{% blocktranslate trimmed %} diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index df08a14c81..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 Code of Conduct Committee (\"the " +"href=\"{coc_teams_url}\">Code of Conduct Committee (\"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 Code of Conduct " +"are listed on the Code of Conduct " "Committee 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..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 Code of Conduct Committee (\"the " +"href=\"{coc_teams_url}\">Code of Conduct Committee (\"the " "committee\")." msgstr "" -"Alla svar på rapporter om överträdelser av uppförandekoden kommer att hanteras av en uppförandekodskommitté (\"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 Code of Conduct " +"are listed on the Code of Conduct " "Committee 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 Uppförandekodskommittén. 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 "