Django 1.7, add Makefile

[prawokultury.git] / prawokultury / contact_forms.py

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index abb8384..287f82b 100644 (file)
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -188,42 +188,28 @@ class RegistrationForm(ContactForm):
         return [self[name] for name in ('agree_mailing', 'agree_license', 'agree_toc')]
 
 
-tracks = (
-    _('social security in the creative sector'),
-    _('100 years of the evolution of modern copyright law and industrial property law in Poland '
-      'and of cultural activities regulated by this law'),
-    _('EU copyright reform'),
-    _('blockchain use prospects'),
-    _('reuse of archives and cultural heritage'),
-)
-
-
 class RegisterSpeaker(RegistrationForm):
     form_tag = 'register-speaker'
-    save_as_tag = '2018-speaker'
+    save_as_tag = '2019-speaker'
     form_title = _('Open call for presentations')
     notify_on_register = False
     mailing_field = 'agree_mailing'
 
-    presentation_thematic_track = forms.ChoiceField(
-        label=_('Thematic track'),
-        choices=[(t, t) for t in tracks], widget=forms.RadioSelect())
-
     bio = forms.CharField(label=mark_safe_lazy(
-        _('Short biographical note in Polish (max. 500 characters, not required)')),
-                          widget=forms.Textarea, max_length=500, required=False)
-    bio_en = forms.CharField(label=_('Short biographical note in English (max. 500 characters)'), widget=forms.Textarea,
-                             max_length=500)
+        _('Short biographical note in Polish (max. 500 characters)')),
+                          widget=forms.Textarea, max_length=500, required=True)
+    bio_en = forms.CharField(label=_('Short biographical note in English (max. 500 characters, not required)'), widget=forms.Textarea,
+                             max_length=500, required=False)
     photo = forms.FileField(label=_('Photo'), required=False)
     phone = forms.CharField(label=_('Phone number'), max_length=64,
                             required=False,
                             help_text=_('(used only for organizational purposes)'))
 
     presentation_title = forms.CharField(
-        label=mark_safe_lazy(_('Presentation title in Polish (not required)')),
-        max_length=256, required=False)
+        label=mark_safe_lazy(_('Presentation title in Polish')),
+        max_length=256)
     presentation_title_en = forms.CharField(
-        label=_('Presentation title in English'), max_length=256)
+        label=_('Presentation title in English (not required)'), max_length=256, required=False)
     presentation_summary = forms.CharField(label=_('Presentation summary (max. 1800 characters)'),
                                            widget=forms.Textarea, max_length=1800)
 
@@ -255,7 +241,6 @@ class RegisterSpeaker(RegistrationForm):
             'presentation_title',
             'presentation_title_en',
             'presentation_summary',
-            'presentation_thematic_track',
             # 'presentation_post_conference_publication',
 
             'agree_mailing',
@@ -267,8 +252,8 @@ class RegisterSpeaker(RegistrationForm):
 
 class RemindForm(ContactForm):
     form_tag = 'remind-me'
-    save_as_tag = 'remind-me-2018'
-    form_title = u'CopyCamp 2018'
+    save_as_tag = 'remind-me-2019'
+    form_title = u'CopyCamp 2019'
     notify_on_register = False
     notify_user = False
 
@@ -328,10 +313,10 @@ class WorkshopForm(ContactForm):
               u'(max 800 znaków)',
         max_length=800, widget=forms.Textarea, required=False)
     w_sikorska = workshop_field(
-        u'Zuza Sikorska-Borowska i Krzysztof Siewicz: Autor: projektant / prawo autorskie dla projektantów')
+        u'Krzysztof Siewicz: Autor: projektant / prawo autorskie dla projektantów')
     w_sikorska_question = forms.CharField(
-        label=u'Jeżeli chcesz, możesz przesłać prowadzącym swoje pytanie dotyczące prawa autorskiego, '
-              u'co pomoże im lepiej przygotować warsztaty '
+        label=u'Jeżeli chcesz, możesz przesłać prowadzącemu swoje pytanie dotyczące prawa autorskiego, '
+              u'co pomoże mu lepiej przygotować warsztaty '
               u'(max 800 znaków)',
         max_length=800, widget=forms.Textarea, required=False)
     w_sztoldman = workshop_field(