From 0741ee039a03a272ef7bca51cb77ef1ccd39b07d Mon Sep 17 00:00:00 2001 From: ontowhee <82607723+ontowhee@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:03:31 -0800 Subject: [PATCH 1/5] Remove reference to django-users and django-developers mailing lists from code of conduct pages --- djangoproject/templates/conduct/faq.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html index 433b60910..cd9721704 100644 --- a/djangoproject/templates/conduct/faq.html +++ b/djangoproject/templates/conduct/faq.html @@ -57,7 +57,7 @@

{% blocktranslate %}What does it mean to "adopt" a Co

{% blocktranslate trimmed %} - In practice, this means mailing lists (django-users, django-developers, etc.), + In practice, this means mailing lists (django-announce, django-updates, etc.), the various Django IRC channels (#django, #django-dev, etc.), bug tracking and code review tools, and "official" Django events such as sprints. In addition, violations of this code outside these spaces may affect a person's From 06e0522fa4d5e1cbbbc75bc9fa7c1583ad0d188a Mon Sep 17 00:00:00 2001 From: ontowhee <82607723+ontowhee@users.noreply.github.com> Date: Sun, 8 Dec 2024 10:19:53 -0800 Subject: [PATCH 2/5] Replace reference to mailing list with Django Forum --- djangoproject/templates/conduct/faq.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html index cd9721704..d81ece2dc 100644 --- a/djangoproject/templates/conduct/faq.html +++ b/djangoproject/templates/conduct/faq.html @@ -57,8 +57,7 @@

{% blocktranslate %}What does it mean to "adopt" a Co

{% blocktranslate trimmed %} - In practice, this means mailing lists (django-announce, django-updates, etc.), - the various Django IRC channels (#django, #django-dev, etc.), bug + In practice, this means Django Forum, the various Django IRC channels (#django, #django-dev, etc.), bug tracking and code review tools, and "official" Django events such as sprints. In addition, violations of this code outside these spaces may affect a person's ability to participate within them.{% endblocktranslate %}

From 0fbae113adf80e827f86d35bcb1826c1ef29f982 Mon Sep 17 00:00:00 2001 From: ontowhee <82607723+ontowhee@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:42:05 -0800 Subject: [PATCH 3/5] Replace "mailing list" with "forum" on conduct pages --- djangoproject/templates/conduct/enforcement.html | 6 +++--- djangoproject/templates/conduct/index.html | 2 +- djangoproject/templates/conduct/reporting.html | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html index 03576c58a..127a118e8 100644 --- a/djangoproject/templates/conduct/enforcement.html +++ b/djangoproject/templates/conduct/enforcement.html @@ -122,13 +122,13 @@

{% translate "Resolutions" %}

elsewhere for posterity.{% endblocktranslate %}
  • {% blocktranslate trimmed %} - An imposed vacation (i.e. asking someone to "take a week off" from a mailing list + An imposed vacation (i.e. asking someone to "take a week off" from the forum or IRC). A committee member will communicate this "vacation" to the individual(s). They'll be asked to take this vacation voluntarily, but if they don't agree then a temporary ban may be imposed to enforce this vacation.{% endblocktranslate %}
  • {% blocktranslate trimmed %} - A permanent or temporary ban from some or all Django spaces (mailing lists, IRC, + A permanent or temporary ban from some or all Django spaces (forum, IRC, etc.). The committee will maintain records of all such bans so that they may be reviewed in the future, extended to new Django fora, or otherwise maintained. {% endblocktranslate %}
    • @@ -137,7 +137,7 @@

    {% translate "Resolutions" %}

    A request for a public or private apology. a committee member will deliver this request. The committee may, if it chooses, attach "strings" to this request: for example, the committee may ask a violator to apologize in order to retain his or her membership - on a mailing list.{% endblocktranslate %} + on the forum.{% endblocktranslate %}

    diff --git a/djangoproject/templates/conduct/index.html b/djangoproject/templates/conduct/index.html index 73af246fa..51989066a 100644 --- a/djangoproject/templates/conduct/index.html +++ b/djangoproject/templates/conduct/index.html @@ -36,7 +36,7 @@

    {% translate "Django Code of Conduct" %}

    {% blocktranslate trimmed %} This code of conduct applies to all spaces managed by the Django project or - Django Software Foundation. This includes IRC, the mailing lists, the issue + Django Software Foundation. This includes IRC, the forum, the issue tracker, DSF events, and any other forums created by the project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them. diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html index 20031744d..c0d1496bf 100644 --- a/djangoproject/templates/conduct/reporting.html +++ b/djangoproject/templates/conduct/reporting.html @@ -41,7 +41,7 @@

    {% translate "Django Code of Conduct - Reporting Guide" %}

  • {% translate "Your contact info (so we can get in touch with you if we need to follow up)" %}
  • {% translate "Names (real, nicknames, or pseudonyms) of any individuals involved. If there were other witnesses besides you, please try to include them as well." %}
  • {% translate "When and where the incident occurred. Please be as specific as possible." %}
    • -
  • {% translate "Your account of what occurred. If there is a publicly available record (e.g. a mailing list archive or a public IRC logger) please include a link." %}
    • +
  • {% translate "Your account of what occurred. If there is a publicly available record (e.g. the forum or a public IRC logger) please include a link." %}
  • {% translate "Any extra context you believe existed for the incident." %}
  • {% translate "If you believe this incident is ongoing." %}
  • {% translate "Any other information you believe we should have." %}
    • @@ -80,8 +80,8 @@

    {% translate "What happens after you file a report?" %}

  • {% translate "Nothing (if we determine no violation occurred)." %}
  • {% translate "A private reprimand from the working group to the individual(s) involved." %}
  • {% translate "A public reprimand." %}
    • -
  • {% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from a mailing list or IRC).{% endblocktranslate %}
    • -
  • {% translate "A permanent or temporary ban from some or all Django spaces (mailing lists, IRC, etc.)" %}
    • +
  • {% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from the forum or IRC).{% endblocktranslate %}
    • +
  • {% translate "A permanent or temporary ban from some or all Django spaces (forum, IRC, etc.)" %}
  • {% translate "A request for a public or private apology." %}

    • From 9f97902a05eefa94407e8ccf2ed16d2d3fb86405 Mon Sep 17 00:00:00 2001 From: ontowhee <82607723+ontowhee@users.noreply.github.com> Date: Thu, 12 Dec 2024 06:08:50 -0800 Subject: [PATCH 4/5] Remove references to IRC from code of conduct Co-authored-by: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> --- djangoproject/templates/conduct/enforcement.html | 12 ++++++------ djangoproject/templates/conduct/faq.html | 8 ++++---- djangoproject/templates/conduct/index.html | 2 +- djangoproject/templates/conduct/reporting.html | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/djangoproject/templates/conduct/enforcement.html b/djangoproject/templates/conduct/enforcement.html index 127a118e8..414d1b39a 100644 --- a/djangoproject/templates/conduct/enforcement.html +++ b/djangoproject/templates/conduct/enforcement.html @@ -64,7 +64,7 @@

    {% translate "How the committee will respond to reports" %}

    {% blocktranslate trimmed %} This information will be collected in writing, and whenever possible the - committee's deliberations will be recorded and retained (i.e. IRC transcripts, email + committee's deliberations will be recorded and retained (i.e. chat transcripts, email discussions, recorded voice conversations, etc). {% endblocktranslate %}

    @@ -79,7 +79,7 @@

    {% translate "Acting Unilaterally" %}

    {% blocktranslate trimmed %} - If the act is ongoing (such as someone engaging in harassment in #django), or involves + If the act is ongoing (such as someone engaging in harassment on the forum), or involves a threat to anyone's safety (e.g. threats of violence), any committee member may act immediately (before reaching consensus) to end the situation. In ongoing situations, any member may at their discretion employ any of the tools available @@ -117,18 +117,18 @@

    {% translate "Resolutions" %}

  • {% blocktranslate trimmed %} A public reprimand. In this case, a committee member will deliver that reprimand - in the same venue that the violation occurred (i.e. in IRC for an IRC violation; + in the same venue that the violation occurred (i.e. in the forum for a forum violation; email for an email violation, etc.). The committee may choose to publish this message elsewhere for posterity.{% endblocktranslate %}
  • {% blocktranslate trimmed %} - An imposed vacation (i.e. asking someone to "take a week off" from the forum - or IRC). A committee member will communicate this "vacation" to the individual(s). + An imposed vacation (i.e. asking someone to "take a week off" from the forum). + A committee member will communicate this "vacation" to the individual(s). They'll be asked to take this vacation voluntarily, but if they don't agree then a temporary ban may be imposed to enforce this vacation.{% endblocktranslate %}
  • {% blocktranslate trimmed %} - A permanent or temporary ban from some or all Django spaces (forum, IRC, + A permanent or temporary ban from some or all Django spaces (the forum, etc.). The committee will maintain records of all such bans so that they may be reviewed in the future, extended to new Django fora, or otherwise maintained. {% endblocktranslate %}
    • diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html index d81ece2dc..15c006819 100644 --- a/djangoproject/templates/conduct/faq.html +++ b/djangoproject/templates/conduct/faq.html @@ -57,10 +57,10 @@

    {% blocktranslate %}What does it mean to "adopt" a Co

    {% blocktranslate trimmed %} - In practice, this means Django Forum, the various Django IRC channels (#django, #django-dev, etc.), bug - tracking and code review tools, and "official" Django events such as sprints. - In addition, violations of this code outside these spaces may affect a person's - ability to participate within them.{% endblocktranslate %}

    + In practice, this means the Django forum, bug tracking and code review tools, and + "official" Django events such as DjangoCons. In addition, violations of this code + outside these spaces may affect a person's ability to participate within them. + {% endblocktranslate %}

    {% translate "What about events funded by the Django Software Foundation?" %}

    diff --git a/djangoproject/templates/conduct/index.html b/djangoproject/templates/conduct/index.html index 51989066a..52ebf30fb 100644 --- a/djangoproject/templates/conduct/index.html +++ b/djangoproject/templates/conduct/index.html @@ -36,7 +36,7 @@

    {% translate "Django Code of Conduct" %}

    {% blocktranslate trimmed %} This code of conduct applies to all spaces managed by the Django project or - Django Software Foundation. This includes IRC, the forum, the issue + Django Software Foundation. This includes the issue tracker, DSF events, and any other forums created by the project team which the community uses for communication. In addition, violations of this code outside these spaces may affect a person's ability to participate within them. diff --git a/djangoproject/templates/conduct/reporting.html b/djangoproject/templates/conduct/reporting.html index c0d1496bf..277978481 100644 --- a/djangoproject/templates/conduct/reporting.html +++ b/djangoproject/templates/conduct/reporting.html @@ -41,7 +41,7 @@

    {% translate "Django Code of Conduct - Reporting Guide" %}

  • {% translate "Your contact info (so we can get in touch with you if we need to follow up)" %}
  • {% translate "Names (real, nicknames, or pseudonyms) of any individuals involved. If there were other witnesses besides you, please try to include them as well." %}
  • {% translate "When and where the incident occurred. Please be as specific as possible." %}
    • -
  • {% translate "Your account of what occurred. If there is a publicly available record (e.g. the forum or a public IRC logger) please include a link." %}
    • +
  • {% translate "Your account of what occurred. If there is a publicly available record (e.g. a forum post) please include a link." %}
  • {% translate "Any extra context you believe existed for the incident." %}
  • {% translate "If you believe this incident is ongoing." %}
  • {% translate "Any other information you believe we should have." %}
    • @@ -80,8 +80,8 @@

    {% translate "What happens after you file a report?" %}

  • {% translate "Nothing (if we determine no violation occurred)." %}
  • {% translate "A private reprimand from the working group to the individual(s) involved." %}
  • {% translate "A public reprimand." %}
    • -
  • {% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from the forum or IRC).{% endblocktranslate %}
    • -
  • {% translate "A permanent or temporary ban from some or all Django spaces (forum, IRC, etc.)" %}
    • +
  • {% blocktranslate %}An imposed vacation (i.e. asking someone to "take a week off" from the forum).{% endblocktranslate %}
    • +
  • {% translate "A permanent or temporary ban from some or all Django spaces (the forum, etc.)" %}
  • {% translate "A request for a public or private apology." %}

    • From d3abc2b91a7174f1abe138da28ab22c3dca1c05e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 12 Dec 2024 14:11:22 +0000 Subject: [PATCH 5/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- djangoproject/templates/conduct/faq.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html index 15c006819..71cd1803e 100644 --- a/djangoproject/templates/conduct/faq.html +++ b/djangoproject/templates/conduct/faq.html @@ -60,7 +60,7 @@

    {% blocktranslate %}What does it mean to "adopt" a Co In practice, this means the Django forum, bug tracking and code review tools, and "official" Django events such as DjangoCons. In addition, violations of this code outside these spaces may affect a person's ability to participate within them. - {% endblocktranslate %}

    + {% endblocktranslate %}

    {% translate "What about events funded by the Django Software Foundation?" %}