From: Radek Czajka Date: Tue, 24 Sep 2019 11:10:41 +0000 (+0200) Subject: 2019 form. X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/db4a44aa36a99cf462da33e9e5a56f9cf68287f1 2019 form. --- diff --git a/contact/forms.py b/contact/forms.py index 132549e..fb60b9b 100644 --- a/contact/forms.py +++ b/contact/forms.py @@ -107,7 +107,7 @@ class ContactForm(forms.Form): 'contact/mail_body.txt', ], dictionary, context) send_mail(mail_subject, mail_body, - 'no-reply@%s' % site.domain, + 'no-reply@nowoczesnapolska.org.pl', [contact.contact], fail_silently=True) if self.mailing_field and self.cleaned_data[self.mailing_field]: diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py index a65f877..287f82b 100644 --- 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', diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index 4694524..f804bde 100644 Binary files a/prawokultury/locale/pl/LC_MESSAGES/django.mo and b/prawokultury/locale/pl/LC_MESSAGES/django.mo differ diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po index 3028bae..b167a6d 100644 --- a/prawokultury/locale/pl/LC_MESSAGES/django.po +++ b/prawokultury/locale/pl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: prawokultury\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-05 12:37+0200\n" +"POT-Creation-Date: 2019-09-23 10:19+0000\n" "PO-Revision-Date: 2014-09-30 16:25+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" @@ -23,23 +23,23 @@ msgstr "" msgid "Registration" msgstr "Rejestracja" -#: contact_forms.py:35 contact_forms.py:298 +#: contact_forms.py:35 contact_forms.py:294 msgid "First name" msgstr "Imię" -#: contact_forms.py:36 contact_forms.py:299 +#: contact_forms.py:36 contact_forms.py:295 msgid "Last name" msgstr "Nazwisko" -#: contact_forms.py:37 contact_forms.py:281 contact_forms.py:300 +#: contact_forms.py:37 contact_forms.py:277 contact_forms.py:296 msgid "E-mail" msgstr "E-mail" -#: contact_forms.py:38 contact_forms.py:282 contact_forms.py:301 +#: contact_forms.py:38 contact_forms.py:278 contact_forms.py:297 msgid "Organization" msgstr "Organizacja" -#: contact_forms.py:40 contact_forms.py:303 +#: contact_forms.py:40 contact_forms.py:299 msgid "Country of residence" msgstr "Kraj zamieszkania" @@ -275,11 +275,11 @@ msgstr "" "Chcę otrzymywać informacje o przyszłych CopyCampach i podobnych działaniach " "Fundacji Nowoczesna Polska na e-mail" -#: contact_forms.py:135 contact_forms.py:363 +#: contact_forms.py:135 contact_forms.py:359 msgid "Permission for publication" msgstr "Zgoda na publikację" -#: contact_forms.py:137 contact_forms.py:365 +#: contact_forms.py:137 contact_forms.py:361 msgid "" "I agree to having materials, recorded during the conference, released under " "the terms of CC BY-SA oraz rozpowszechnianie wizerunku." -#: contact_forms.py:151 contact_forms.py:376 +#: contact_forms.py:151 contact_forms.py:372 #, python-format msgid "I accept Terms and Conditions of CopyCamp" msgstr "Akceptuję Regulamin CopyCampu" @@ -341,80 +341,76 @@ msgid "Open call for presentations" msgstr "Otwarty nabór prezentacji" #: contact_forms.py:209 -msgid "Thematic track" -msgstr "Ścieżka tematyczna" - -#: contact_forms.py:213 -msgid "Short biographical note in Polish (max. 500 characters, not required)" +msgid "Short biographical note in Polish (max. 500 characters)" msgstr "Krótka notka biograficzna po polsku (max. 500 znaków)" -#: contact_forms.py:215 -msgid "Short biographical note in English (max. 500 characters)" -msgstr "Krótka notka biograficzna po angielsku (max. 500 znaków)" +#: contact_forms.py:211 +msgid "Short biographical note in English (max. 500 characters, not required)" +msgstr "Krótka notka biograficzna po angielsku (max. 500 znaków, nie wymagana)" -#: contact_forms.py:217 +#: contact_forms.py:213 msgid "Photo" msgstr "Zdjęcie" -#: contact_forms.py:218 +#: contact_forms.py:214 msgid "Phone number" msgstr "Numer telefonu" -#: contact_forms.py:220 +#: contact_forms.py:216 msgid "(used only for organizational purposes)" msgstr "(używany wyłącznie do celów organizacyjnych)" -#: contact_forms.py:223 -msgid "Presentation title in Polish (not required)" +#: contact_forms.py:219 +msgid "Presentation title in Polish" msgstr "Polski tytuł prezentacji" -#: contact_forms.py:226 -msgid "Presentation title in English" -msgstr "Angielski tytuł prezentacji" +#: contact_forms.py:222 +msgid "Presentation title in English (not required)" +msgstr "Angielski tytuł prezentacji (nie wymagany)" -#: contact_forms.py:227 +#: contact_forms.py:223 msgid "Presentation summary (max. 1800 characters)" msgstr "Streszczenie (maks. 1800 znaków)" -#: contact_forms.py:239 +#: contact_forms.py:235 msgid "" "I accept CopyCamp Terms and " "Conditions." msgstr "Akceptuję regulamin CopyCampu" -#: contact_forms.py:278 +#: contact_forms.py:274 msgid "Next CopyCamp" msgstr "Kolejny CopyCamp" -#: contact_forms.py:280 +#: contact_forms.py:276 msgid "Name" msgstr "Imię i nazwisko" -#: contact_forms.py:294 +#: contact_forms.py:290 msgid "Workshop" msgstr "Warsztat" -#: contact_forms.py:306 +#: contact_forms.py:302 msgid "

I'll take a part in workshops

" msgstr "

Wezmę udział w warsztatach

" -#: contact_forms.py:307 +#: contact_forms.py:303 msgid "Only workshops with any spots left are visible here." msgstr "Widoczne są tylko warsztaty, w których są jeszcze miejsca." -#: contact_forms.py:309 +#: contact_forms.py:305 msgid "Friday, October 5th, 11 a.m.–1 p.m." msgstr "Piątek, 5 października, 11:00–13:00" -#: contact_forms.py:319 +#: contact_forms.py:315 msgid "The workshop will be conducted in English." msgstr "Warsztat będzie prowadzony po angielsku." -#: contact_forms.py:321 +#: contact_forms.py:317 msgid "Saturday, October 6th, 11 a.m.–1 p.m." msgstr "Sobota, 6 października, 11:00–13:00" -#: contact_forms.py:360 +#: contact_forms.py:356 msgid "" "I am interested in receiving information about the Modern Poland " "Foundation's activities by e-mail" @@ -422,11 +418,11 @@ msgstr "" "Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących " "działalności Fundacji Nowoczesna Polska" -#: contact_forms.py:403 +#: contact_forms.py:399 msgid "You can't choose more than one workshop during the same period" msgstr "Nie możesz wybrać warsztatów odbywających się w tym samym czasie" -#: contact_forms.py:405 +#: contact_forms.py:401 msgid "Please choose at least one workshop." msgstr "Proszę wybrać co najmniej jeden warsztat." @@ -462,11 +458,7 @@ msgstr "CopyCamp" msgid "Search" msgstr "Szukaj" -#: templates/base.html:68 -msgid "Workshops" -msgstr "Warsztaty" - -#: templates/base.html:106 +#: templates/base.html:109 msgid "" "If not explicitly stated otherwise, all texts are licensed under the Creative Commons " @@ -476,7 +468,7 @@ msgstr "" "href='http://creativecommons.org/licenses/by-sa/3.0/deed.pl'>Creative " "Commons Uznanie autorstwa – Na tych samych warunkach." -#: templates/contact/register/form.html:34 +#: templates/contact/register/form.html:35 msgid "" "We would be grateful if you could answer our questions below. This will " "allow us to better adapt to your expectations in the future." @@ -505,8 +497,8 @@ msgstr "Wiadomość wysłana automatycznie. Prosimy nie odpowiadać." # msgstr "Wiadomość wysłana automatycznie, prosimy nie odpowiadać." #: templates/contact/register/mail_subject.txt:1 -msgid "Thank you for registering to CopyCamp 2018" -msgstr "Dziękujemy za rejestrację na konferencję CopyCamp 2018" +msgid "Thank you for registering to CopyCamp 2019" +msgstr "Dziękujemy za rejestrację na konferencję CopyCamp 2019" #: templates/contact/register/thanks.html:5 #: templates/contact/workshops/thanks.html:5 @@ -559,6 +551,15 @@ msgstr "" "Dziękujemy za wypełnienie formularza rejestracji na warsztaty na stronie " "%(site_name)s." +#~ msgid "Presentation title in Polish (not required)" +#~ msgstr "Polski tytuł prezentacji" + +#~ msgid "Thematic track" +#~ msgstr "Ścieżka tematyczna" + +#~ msgid "Workshops" +#~ msgstr "Warsztaty" + #~ msgid "Country" #~ msgstr "Kraj" diff --git a/prawokultury/templates/contact/register/form.html b/prawokultury/templates/contact/register/form.html index ba09d01..f61ff13 100644 --- a/prawokultury/templates/contact/register/form.html +++ b/prawokultury/templates/contact/register/form.html @@ -31,10 +31,12 @@ {% for field in form.main_fields %} {% include "snippets/field_as_table_row.html" %} {% endfor %} + {% if form.survey_fields %}

{% trans "We would be grateful if you could answer our questions below. This will allow us to better adapt to your expectations in the future." %}

{% for field in form.survey_fields %} {% include "snippets/field_as_table_row.html" %} {% endfor %} + {% endif %} {% for field in form.agreement_fields %} {% include "snippets/field_as_table_row.html" %} diff --git a/prawokultury/templates/contact/register/mail_subject.txt b/prawokultury/templates/contact/register/mail_subject.txt index a9788da..1aca628 100755 --- a/prawokultury/templates/contact/register/mail_subject.txt +++ b/prawokultury/templates/contact/register/mail_subject.txt @@ -1 +1 @@ -{% load i18n %}{% trans "Thank you for registering to CopyCamp 2018" %} +{% load i18n %}{% trans "Thank you for registering to CopyCamp 2019" %}