Skip to content
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.

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

fix #1727: Remove reference to IRC and django-users and django-developers mailing lists in CoC #1808

Conversation

ontowhee
Copy link
Contributor

@ontowhee ontowhee commented Dec 8, 2024

Fix #1727

Text changes for the page (https://www.djangoproject.com/conduct/faq/)

Before
Screenshot 2024-12-08 at 10 02 03 AM

After
Screenshot 2024-12-08 at 10 18 54 AM

@bmispelon
Copy link
Member

I found a few more refences to the mailing list(s) that should be changed to refer to the forum instead (found them using git grep -iE "mailing.list" -- djangoproject/templates/conduct/)

Thanks! 🎸

@ontowhee ontowhee changed the title fix #1727: Remove reference to django-users and django-developers mailing lists fix #1727: Remove reference to IRC and django-users and django-developers mailing lists in CoC Dec 12, 2024
@ontowhee
Copy link
Contributor Author

Changes from #1823 are included in this PR.

Copy link
Member

@thibaudcolas thibaudcolas left a comment

Choose a reason for hiding this comment

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

Thank you @ontowhee @sarahboyce! I think it’d be nice for our CoC working group to further review the choice of word, but all the changes here seem very solid to me as-is, so I believe we’re good to go with those improvements.

@thibaudcolas thibaudcolas merged commit 87cc4de into django:main Jan 22, 2025
4 checks passed
@thibaudcolas
Copy link
Member

I had created #1895 to capture any last follow-up work but really there’s only two occurrences that I’d want to recommend changing, and the current wording is clearly better.

So I’ll just follow up with CoC people over email. For ref here’s the additional changes I considered as a patch:

diff --git a/djangoproject/templates/conduct/faq.html b/djangoproject/templates/conduct/faq.html
index 71cd1803..798e8c8d 100644
--- a/djangoproject/templates/conduct/faq.html
+++ b/djangoproject/templates/conduct/faq.html
@@ -57,10 +57,10 @@

   <p>
     {% blocktranslate trimmed %}
-      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 %}</p>
+      In practice, this means online discussion spaces (chat, forum, 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 %}</p>

   <h3 id="dsf-events">{% translate "What about events funded by the Django Software Foundation?" %} <a class="plink" href="#dsf-events">¶</a></h3>
   <p>
diff --git a/djangoproject/templates/conduct/index.html b/djangoproject/templates/conduct/index.html
index 52ebf30f..87fd05fa 100644
--- a/djangoproject/templates/conduct/index.html
+++ b/djangoproject/templates/conduct/index.html
@@ -36,8 +36,8 @@
   <p>
     {% blocktranslate trimmed %}
       This code of conduct applies to all spaces managed by the Django project or
-      Django Software Foundation. This includes the issue
-      tracker, DSF events, and any other forums created by the project team
+      Django Software Foundation. This includes chat platforms, the forum, the issue
+      tracker, DSF events, and any other space 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.
     {% endblocktranslate %}</p>
--

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Retire django-developers and django-users mailing list
3 participants