CopyleftConf/copyleftconf-website File Diff

File diff 389a4fd5fad5 → e472ddff2c42

pinaxcon/proposals/models.py

➞

Show inline comments

@@ ... / @@ -18,23 +18,23 @@ class ConferenceSpeaker(SpeakerBase): @@
     def save(self, *args, **kwargs):
         self.experience_html = parse(self.experience)
         self.twitter_username = self.clean_twitter_username()
         return super(ConferenceSpeaker, self).save(*args, **kwargs)
     twitter_username = models.CharField(
-        max_length=15,
+        max_length=65,
         blank=True,
         help_text=_(u"Your Twitter account")
+    )
     first_time = models.BooleanField(
         blank=True,
         default=False,
         verbose_name=_("First-time speaker?"),
         help_text=_("Check this field if this is your first time speaking "
-                    "at a technical conference."),
+                    "at a free software conference."),
+        )
     experience = models.TextField(blank=True, help_text=_
         ("List any past speaking experience you have. This can include "
          "user groups, meetups, or presentations at work or school.  Edit "
          "using <a href='http://warpedvisions.org/projects/"
@@ ... / @@ -45,35 +45,33 @@ class ConferenceSpeaker(SpeakerBase): @@
     experience_html = models.TextField(blank=True)
     travel_assistance = models.BooleanField(
         blank=True,
         default=False,
         verbose_name=_("Travel assistance required?"),
         help_text=_("Check this field if you require travel assistance to get "
                     "to North Bay Python in Petaluma, California."),
         help_text=_("Check this field if you require travel assistance."),
+    )
     lodging_assistance = models.BooleanField(
         blank=True,
         default=False,
         verbose_name=_("Lodging assistance required?"),
         help_text=_("Check this field if you require lodging assistance in "
                     "Petaluma, California during North Bay Python."),
         help_text=_("Check this field if you require lodging assistance."),
+    )
     home_city = models.CharField(
         blank=True,
         max_length=127,
         help_text=_("Which city (and state, and country) will you be "
-                    "traveling from to get to North Bay Python?"),
+                    "traveling from to get to CopyleftConf?"),
+    )
     minority_group = models.CharField(blank=True, max_length=256,
         verbose_name=_("Diversity statement"),
         help_text=_("If you are a member of one or more groups that are "
-                    "under-represented in the tech industry, you may list "
+                    "under-represented in the free software community, you may list "
                     "these here. Your response is optional."),
+    )
     reviewer = models.EmailField(
         blank=True,
         null=True,
@@ ... / @@ -89,48 +87,39 @@ class ConferenceSpeaker(SpeakerBase): @@
                     "accepted, agree that I will comply with the "
                     "<a href='/code-of-conduct'>Code of Conduct</a>."),
+    )
 class Proposal(ProposalBase):
     extended_presentation = models.BooleanField(
         default=False,
         verbose_name=_("Optionally consider this proposal for a 45-minute "
                        "slot"),
         help_text=_("Most talks at North Bay Python go for 30 minutes. We "
                     "have some openings for 45-minute talks. If you check this "
                     "field, please explain in your additional notes how you "
                     "would use the extra 15 minutes."),
+    )
     extra_av = models.TextField(
         blank=True,
         verbose_name=_("Extra tech and A/V requirements"),
         help_text=_("We will provide you with a projector with HDMI "
                     "connection, an audio connection, and one microphone per "
                     "speaker. If you need anything more than this to present "
                     "this talk, please list them here."),
+    )
     new_presentation = models.BooleanField(
         default=False,
         verbose_name=_("This is a new presentation"),
         help_text=_("Check this box if North Bay Python will be the first "
                     "time this talk is presented at a technical conference."),
         help_text=_("Check this box if CopyleftConf will be the first "
                     "time this talk is presented."),
+    )
     slides_release = models.BooleanField(
         default=True,
         help_text=_("I authorize North Bay Python to release a copy of my "
                     "slides and related materials under the Creative Commons "
                     "Attribution-ShareAlike 3.0 United States licence, and "
                     "certify that I have the authority to do so."),
         help_text=_("I authorize Software Freedom Conservancy to distribute my "
                     "slides and related materials under either the GNU General "
                     "Public License, version 3.0 or the Creative Commons "
                     "Attribution-ShareAlike License, version 4.0, as I specify; "
                     "and certify that I have the authority to do so."),
+    )
     recording_release = models.BooleanField(
         default=True,
         help_text=_("I authorize North Bay Python to release a recording of "
                     "my talk under the Creative Commons "
                     "Attribution-ShareAlike 3.0 United States licence."),
         help_text=_("I authorize Software Freedom Conservancy to distribute a "
                     "recording of my talk under the same license I specify for "
                     "my slides."),
+    )
     class Meta:
         abstract = True