update registration confirmation and turn off translation

[prawokultury.git] / prawokultury / contact_forms.py

diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py
index 0d87bea..6a5130f 100644 (file)
--- a/prawokultury/contact_forms.py
+++ b/prawokultury/contact_forms.py
@@ -7,10 +7,12 @@ from contact.forms import ContactForm
 from contact.models import Contact
 from contact.fields import HeaderField
 from django.utils.functional import lazy
 from contact.models import Contact
 from contact.fields import HeaderField
 from django.utils.functional import lazy

-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_noop as _

 from django.utils.safestring import mark_safe
 from migdal.models import Entry
 
 from django.utils.safestring import mark_safe
 from migdal.models import Entry
 

+from prawokultury.countries import COUNTRIES
+

 mark_safe_lazy = lazy(mark_safe, unicode)
 
 
 mark_safe_lazy = lazy(mark_safe, unicode)
 
 


@@ -19,6 +21,7 @@ class RegistrationForm(ContactForm):
 
     save_as_tag = '2017'
     conference_name = u'CopyCamp 2017'
 
     save_as_tag = '2017'
     conference_name = u'CopyCamp 2017'

+    notify_on_register = False

     
     form_title = _('Registration')
     admin_list = ['first_name', 'last_name', 'organization']
     
     form_title = _('Registration')
     admin_list = ['first_name', 'last_name', 'organization']


@@ -28,14 +31,14 @@ class RegistrationForm(ContactForm):
     contact = forms.EmailField(label=_('E-mail'), max_length=128)
     organization = forms.CharField(label=_('Organization'), 
             max_length=256, required=False)
     contact = forms.EmailField(label=_('E-mail'), max_length=128)
     organization = forms.CharField(label=_('Organization'), 
             max_length=256, required=False)

-    country = forms.CharField(label=_('Country'), max_length=128)
+    country = forms.ChoiceField(label=_('Country'), choices=zip(COUNTRIES, COUNTRIES))

 
     days = forms.ChoiceField(
        label=_("I'm planning to show up on"),
        choices=[
            ('both', _('Both days of the conference')),
 
     days = forms.ChoiceField(
        label=_("I'm planning to show up on"),
        choices=[
            ('both', _('Both days of the conference')),

-           ('only-27th', _('October 27th only')),
-           ('only-28th', _('October 28th only')),
+           ('only-28th', _('September 28th only')),
+           ('only-29th', _('September 29th only')),

        ], widget=forms.RadioSelect())
 
     # ankieta
        ], widget=forms.RadioSelect())
 
     # ankieta


@@ -48,6 +51,7 @@ class RegistrationForm(ContactForm):
             ('2', _('twice')),
             ('3', _('three times')),
             ('4', _('four times')),
             ('2', _('twice')),
             ('3', _('three times')),
             ('4', _('four times')),

+            ('5', _('five times')),

         ], widget=forms.RadioSelect())
     age = forms.ChoiceField(
         required=False,
         ], widget=forms.RadioSelect())
     age = forms.ChoiceField(
         required=False,


@@ -61,18 +65,9 @@ class RegistrationForm(ContactForm):
             ('56-65', _('56-65')),
             ('66+', _('66 or above')),
         ], widget=forms.RadioSelect())
             ('56-65', _('56-65')),
             ('66+', _('66 or above')),
         ], widget=forms.RadioSelect())

-    distance = forms.ChoiceField(
-        required=False,
-        label=_("3. How far will you travel to attend CopyCamp?"),
-        choices=[
-            ('0-50', _('0-50 km')),
-            ('51-100', _('51-100 km')),
-            ('101-200', _('101-200 km')),
-            ('200+', _('200 km or more')),
-        ], widget=forms.RadioSelect())

     areas = forms.MultipleChoiceField(
         required=False,
     areas = forms.MultipleChoiceField(
         required=False,

-        label=_("4. Please indicate up to 3 areas you feel most affiliated with"),
+        label=_("3. Please indicate up to 3 areas you feel most affiliated with"),

         choices=[
             ('sztuki plastyczne', _('visual art')),
             ('literatura', _('literature')),
         choices=[
             ('sztuki plastyczne', _('visual art')),
             ('literatura', _('literature')),


@@ -95,7 +90,7 @@ class RegistrationForm(ContactForm):
     areas_other = forms.CharField(required=False, label=_('Fill if you selected “other” above'))
     source = forms.ChoiceField(
         required=False,
     areas_other = forms.CharField(required=False, label=_('Fill if you selected “other” above'))
     source = forms.ChoiceField(
         required=False,

-        label=_("5. Please indicate how you received information about the conference:"),
+        label=_("4. Please indicate how you received information about the conference:"),

         choices=[
             ('znajomi', _('through friends sharing on the web')),
             ('znajomi2', _('through friends by other means')),
         choices=[
             ('znajomi', _('through friends sharing on the web')),
             ('znajomi2', _('through friends by other means')),


@@ -109,9 +104,9 @@ class RegistrationForm(ContactForm):
         required=False,
         label=_("6. Please indicate the most important factor for your willingness to participate:"),
         choices=[
         required=False,
         label=_("6. Please indicate the most important factor for your willingness to participate:"),
         choices=[

-            ('idea', _('the main idea of the conference')),
-            ('speaker', _('particular speaker(s)')),
+            ('speaker', _('listening to particular speaker(s)')),

             ('networking', _('good networking occasion')),
             ('networking', _('good networking occasion')),

+            ('partnering', _('partnering with organisations present at the event')),

             ('other', _('other (please specify below)')),
         ], widget=forms.RadioSelect())
     motivation_other = forms.CharField(required=False, label=_('Fill if you selected “other” above'))
             ('other', _('other (please specify below)')),
         ], widget=forms.RadioSelect())
     motivation_other = forms.CharField(required=False, label=_('Fill if you selected “other” above'))


@@ -154,7 +149,7 @@ class RegistrationForm(ContactForm):
 
     def survey_fields(self):
         return [self[name] for name in (
 
     def survey_fields(self):
         return [self[name] for name in (

-            'times_attended', 'age', 'distance',
+            'times_attended', 'age',

             'areas', 'areas_other', 'source', 'source_other', 'motivation', 'motivation_other')]
 
     def agreement_fields(self):
             'areas', 'areas_other', 'source', 'source_other', 'motivation', 'motivation_other')]
 
     def agreement_fields(self):


@@ -185,12 +180,12 @@ tracks = (
 
 
 class RegisterSpeaker(RegistrationForm):
 
 
 class RegisterSpeaker(RegistrationForm):

-    from django.utils.translation import ugettext_noop as _

     form_tag = 'register-speaker'
     save_as_tag = '2017-speaker'
     form_title = _('Open call for presentations')
     form_tag = 'register-speaker'
     save_as_tag = '2017-speaker'
     form_title = _('Open call for presentations')

+    notify_on_register = False

 
 

-    # inherited fields included do they are not translated
+    # inherited fields included so they are not translated

     first_name = forms.CharField(label=_('First name'), max_length=128)
     last_name = forms.CharField(label=_('Last name'), max_length=128)
     organization = forms.CharField(label=_('Organization'),
     first_name = forms.CharField(label=_('First name'), max_length=128)
     last_name = forms.CharField(label=_('Last name'), max_length=128)
     organization = forms.CharField(label=_('Organization'),


@@ -268,6 +263,14 @@ class RegisterSpeaker(RegistrationForm):
         ]
 
 
         ]
 
 

+class RemindForm(ContactForm):
+    form_tag = 'remind-me'
+    save_as_tag = 'remind-me-2017'
+    form_title = u'CopyCamp 2017'
+    notify_on_register = False
+    notify_user = False
+
+

 class NextForm(ContactForm):
     form_tag = '/next'
     form_title = _('Next CopyCamp')
 class NextForm(ContactForm):
     form_tag = '/next'
     form_title = _('Next CopyCamp')