feat(#2922): Update verbiage in some models (#2923)

Author: pbanaszkiewicz

src/extforms/forms.py

@@ -225,7 +225,7 @@ def validate_member_code(self, request: HttpRequest) -> None | dict[str, Validat
             "a code that has not yet been activated, "
             "or a code with no training seats remaining. "
             "Please confirm that you have copied the code correctly, "
-            "or confirm the code with the Membership Contact for your group. "
+            "or confirm the code with the Membership or Partnership Contact for your group. "
             "If the code seems to be correct, tick the checkbox below to ignore "
             "this message."
         )

src/extrequests/migrations/0038_alter_selforganisedsubmission_member_code_and_more.py

@@ -0,0 +1,71 @@
+# Generated by Django 5.2.12 on 2026-03-09 18:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("extrequests", "0037_alter_selforganisedsubmission_member_code_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="selforganisedsubmission",
+            name="member_code",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="If you are affiliated with a Carpentries member or partner organization, please enter your "
+                "registration code.",
+                max_length=40,
+                verbose_name="Registration code",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workshopinquiryrequest",
+            name="administrative_fee",
+            field=models.CharField(
+                choices=[
+                    (
+                        "nonprofit",
+                        "I am with a government site, university, or other nonprofit. I understand the workshop fee as "
+                        "listed on The Carpentries website and agree to follow through on The Carpentries invoicing "
+                        "process.",
+                    ),
+                    (
+                        "forprofit",
+                        "I am with a corporate or for-profit site. I understand the costs for for-profit organisations "
+                        "are higher than the price for not-for-profit organisations, as listed on The Carpentries "
+                        "website.",
+                    ),
+                    (
+                        "member",
+                        "I am with a Member or Partner organisation so the workshop fee does not apply (instructor "
+                        "travel costs will still apply for in-person workshops).",
+                    ),
+                    (
+                        "waiver",
+                        "I am requesting financial support for the workshop fee (instructor travel costs will still "
+                        "apply for in-person workshops)",
+                    ),
+                ],
+                default=None,
+                help_text="<b><a href='https://carpentries.org/workshops/#workshop-cost' target='_blank' "
+                "rel='noreferrer nofollow'>The Carpentries website workshop fee listing.</a></b>",
+                max_length=20,
+                verbose_name="Which of the following applies to your payment for the administrative fee?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workshopinquiryrequest",
+            name="member_code",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="If you are affiliated with a Carpentries member or partner organization, please enter your"
+                " registration code.",
+                max_length=40,
+                verbose_name="Registration code",
+            ),
+        ),
+    ]

src/extrequests/models.py

@@ -225,7 +225,7 @@ class WorkshopInquiryRequest(
         ),
         (
             "member",
-            "I am with a Member organisation so the workshop fee does not apply "
+            "I am with a Member or Partner organisation so the workshop fee does not apply "
             "(instructor travel costs will still apply for in-person workshops).",
         ),
         (

src/templates/forms/trainingrequest.html

@@ -8,7 +8,7 @@
 
 {% block content %}
 
-<p>Trainees selected by Carpentries member organizations are asked to complete this <b>Instructor Training Profile Creation Form</b>. This creates an entry in our database and allows us to record attendance and track your progress through the Instructor certification process. Form responses are not reviewed in detail but may be used in programmatic assessment. Your application materials and information about your progress towards The Carpentries Instructor certification may be shared with our contacts at your member site. Please note that this form is separate from event registration. Your site contact will provide you with instructions to register for an Instructor Training event. </p>
+<p>Trainees selected by Carpentries member or partner organizations are asked to complete this <b>Instructor Training Profile Creation Form</b>. This creates an entry in our database and allows us to record attendance and track your progress through the Instructor certification process. Form responses are not reviewed in detail but may be used in programmatic assessment. Your application materials and information about your progress towards The Carpentries Instructor certification may be shared with our contacts at your member or partner site. Please note that this form is separate from event registration. Your site contact will provide you with instructions to register for an Instructor Training event. </p>
 
 <p> More details about the Instructor role are available on the <a href="https://carpentries.org/become-instructor/">Become an Instructor</a> page on The Carpentries website. To learn more about what the training will cover, please see our <a href="http://carpentries.github.io/instructor-training/">Instructor Training curriculum</a>.
 </p>

src/templates/forms/workshoprequest.html

@@ -19,7 +19,7 @@
 <p class="lead">
     If you would like more information about our workshops before scheduling, please
     <a href="{% url 'workshop_inquiry' %}">request workshop information</a>.
-    If you are a Member Organisation or Instructor who is coordinating
+    If you are a Member/Partner Organisation or Instructor who is coordinating
     a self-organised workshop please
     <a href="{% url 'selforganised_submission' %}">use this form to register your workshop</a>.
 </p>

src/workshops/migrations/0292_alter_trainingrequest_member_code_and_more.py

@@ -0,0 +1,71 @@
+# Generated by Django 5.2.12 on 2026-03-09 18:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("workshops", "0291_person_airport_timezone_migration"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="trainingrequest",
+            name="member_code",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="If you have been given a registration code through a Carpentries member or partner site or "
+                "for a specific scheduled event, please enter it here:",
+                max_length=100,
+                verbose_name="Registration Code",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workshoprequest",
+            name="administrative_fee",
+            field=models.CharField(
+                choices=[
+                    (
+                        "nonprofit",
+                        "I am with a government site, university, or other nonprofit. I understand the workshop fee as "
+                        "listed on The Carpentries website and agree to follow through on The Carpentries invoicing "
+                        "process.",
+                    ),
+                    (
+                        "forprofit",
+                        "I am with a corporate or for-profit site. I understand the costs for for-profit organisations "
+                        "are higher than the price for not-for-profit organisations, as listed on The Carpentries "
+                        "website.",
+                    ),
+                    (
+                        "member",
+                        "I am with a Member or Partner organisation so the workshop fee does not apply (instructor "
+                        "travel costs will still apply for in-person workshops).",
+                    ),
+                    (
+                        "waiver",
+                        "I am requesting financial support for the workshop fee (instructor travel costs will still "
+                        "apply for in-person workshops)",
+                    ),
+                ],
+                default=None,
+                help_text="<b><a href='https://carpentries.org/workshops/#workshop-cost' target='_blank' "
+                "rel='noreferrer nofollow'>The Carpentries website workshop fee listing.</a></b>",
+                max_length=20,
+                verbose_name="Which of the following applies to your payment for the administrative fee?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workshoprequest",
+            name="member_code",
+            field=models.CharField(
+                blank=True,
+                default="",
+                help_text="If you are affiliated with a Carpentries member or partner organization, please enter your "
+                "registration code.",
+                max_length=40,
+                verbose_name="Registration code",
+            ),
+        ),
+    ]

src/workshops/models.py

@@ -2182,7 +2182,7 @@ class TrainingRequest(
         max_length=STR_LONG,
         verbose_name="Registration Code",
         help_text="If you have been given a registration code through "
-        "a Carpentries member site or for a specific scheduled "
+        "a Carpentries member or partner site or for a specific scheduled "
         "event, please enter it here:",
     )
     member_code_override = models.BooleanField(
@@ -2973,9 +2973,8 @@ class CommonRequest(SecondaryEmailMixin, models.Model):
         null=False,
         default="",
         verbose_name="Registration code",
-        help_text="If you are affiliated with a Carpentries member organization, "
-        "please enter the registration code associated with the membership or partnership. "
-        "Your Member Affiliate can provide this.",
+        help_text="If you are affiliated with a Carpentries member or partner organization, "
+        "please enter your registration code.",
     )
 
     ONLINE_INPERSON_CHOICES = (
@@ -3226,7 +3225,7 @@ class WorkshopRequest(
         ),
         (
             "member",
-            "I am with a Member organisation so the workshop fee does not apply "
+            "I am with a Member or Partner organisation so the workshop fee does not apply "
             "(instructor travel costs will still apply for in-person workshops).",
         ),
         (