From d9b69c087c841fd647906f9e21f837035be58dcf Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 5 Sep 2018 12:42:12 +0200 Subject: [PATCH] new workshop form --- contact/templates/contact/form.html | 1 + prawokultury/contact_forms.py | 106 +++++++++---------- prawokultury/countries.py | 2 +- prawokultury/locale/pl/LC_MESSAGES/django.mo | Bin 12831 -> 12642 bytes prawokultury/locale/pl/LC_MESSAGES/django.po | 90 +++++++--------- prawokultury/templates/base.html | 2 +- 6 files changed, 89 insertions(+), 112 deletions(-) diff --git a/contact/templates/contact/form.html b/contact/templates/contact/form.html index f291a4c..aa5be1d 100644 --- a/contact/templates/contact/form.html +++ b/contact/templates/contact/form.html @@ -21,6 +21,7 @@ {{ form.as_table }} + {% chunk "contact_form__"|add:form.form_tag|add:"__data_processing" %} diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py index 2996d3f..abb8384 100644 --- a/prawokultury/contact_forms.py +++ b/prawokultury/contact_forms.py @@ -283,8 +283,8 @@ class NextForm(ContactForm): max_length=256, required=False) -def workshop_field(label): - return forms.BooleanField(label=_(label), required=False) +def workshop_field(label, help=None): + return forms.BooleanField(label=_(label), required=False, help_text=help) class WorkshopForm(ContactForm): @@ -299,76 +299,66 @@ class WorkshopForm(ContactForm): last_name = forms.CharField(label=_('Last name'), max_length=128) 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 of residence'), choices=[('', '--------')] + zip(COUNTRIES, COUNTRIES), required=False) _header = HeaderField( label=mark_safe_lazy(_("

I'll take a part in workshops

")), help_text=_('Only workshops with any spots left are visible here.')) - _h1 = HeaderField(label=mark_safe_lazy(_("Thursday, September 28th, 10 a.m.–12 noon"))) - - w_mileszyk = workshop_field( - u'Natalia Mileszyk, Dimitar Dimitrov, Diego Naranjo: School of Rock(ing) Copyright: United to #fixcopyright') - w_wang = workshop_field( - u'Jacob Riddersholm Wang, Pernille Feldt, Martin Appelt: Heritage gone digital - beyond legal rights') - - _h2 = HeaderField(label=mark_safe_lazy(_("Thursday, September 28th, 12 noon–2 p.m."))) - - w_vanderwaal = workshop_field(u'Sander van der Waal, Danny Lämmerhirt: Tackling open license proliferation') - - _h2a = HeaderField(label=mark_safe_lazy(_("Friday, September 29th, 9 a.m.–11 noon"))) - - w_nobre = workshop_field(u'Teresa Nobre, Paul Keller, Sean Flynn: Researching the Impact of Copyright User Rights') - w_nobre_question = forms.CharField( - label=mark_safe_lazy(_( - u'Please describe the most important recent changes to copyright user rights in your national law. ' - u'(max 1500 characters)')), - max_length=1500, widget=forms.Textarea, required=False) - - _h3 = HeaderField(label=mark_safe_lazy(_("Friday, September 29th, 10 a.m.–12 noon"))) - - w_youtube = workshop_field( - u'Kiki Ganzemüller: YouTube Songwriter Workshop: Rights Management & Building a Presence on YouTube') - - _h4 = HeaderField(label=mark_safe_lazy(_("Friday, September 29th, 12 noon–2 p.m."))) - - w_murray = workshop_field( - u'Peter Murray-Rust: Wikidata, ContentMine and the automatic liberation of factual data: ' - u'(The Right to Read is the Right To Mine)') # 30 - - w_zimmermann = workshop_field(u'Jeremie Zimmermann: Hackers ethics and peer-to-peer philosophy in care') + _h1 = HeaderField(label=mark_safe_lazy(_("Friday, October 5th, 11 a.m.–1 p.m."))) + + w_dobosz = workshop_field( + u'Elżbieta Dobosz, Urząd Patentowy RP: Ochrona wzornictwa, co można chronić, co warto chronić i w jaki sposób', + u'Uczestnicy mogą przedstawić na warsztatach swoje wzory – ' + u'rozwiązania wizualne ze wszystkich kategorii produktów.') + w_kozak = workshop_field( + u'Łukasz Kozak i Krzysztof Siewicz: Projekt : Upiór – wprowadzenie i warsztaty dla twórców gier') + w_secker = workshop_field( + u'Jane Secker and Chris Morrison: Embedding Copyright literacy using games-based learning', + _(u'The workshop will be conducted in English.')) + + _h2 = HeaderField(label=mark_safe_lazy(_("Saturday, October 6th, 11 a.m.–1 p.m."))) + + w_kakareko = workshop_field( + u'Ksenia Kakareko: Regulacje prawne dotyczące wykorzystania materiałów zdigitalizowanych') + w_kakareko_question = forms.CharField( + label=u'Możesz opisać sprawy, z którymi najczęściej spotykasz się jako pracownik instytucji posiadającej ' + u'zdigitalizowane zbiory lub jako użytkownik tych zbiorów ' + 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') + 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 ' + u'(max 800 znaków)', + max_length=800, widget=forms.Textarea, required=False) + w_sztoldman = workshop_field( + u'dr Agnieszka Sztoldman, Aleksandra Burda, SMM Legal: Spory o pieniądze w branżach IP-driven') _header_1 = HeaderField(label='') _header_2 = HeaderField(label='') - start_workshops = ('mileszyk', 'wang', 'vanderwaal', 'nobre', 'youtube', 'murray', 'zimmermann') + start_workshops = ('dobosz', 'kozak', 'secker', 'kakareko', 'sikorska', 'sztoldman') slots = ( - ('_h1', 'mileszyk', 'wang'), - ('_h2', 'vanderwaal'), - ('_h2a', 'nobre', '_h3', 'youtube'), - ('_h4', 'murray', 'zimmermann'), + ('_h1', 'dobosz', 'kozak', 'secker'), + ('_h2', 'kakareko', 'sikorska', 'sztoldman'), ) limits = { - 'mileszyk': 25, - 'wang': 25, - 'vanderwaal': 25, - 'nobre': 25, - 'youtube': 40, - 'murray': 35, - 'zimmermann': 35, + 'dobosz': 30, + 'kozak': 30, + 'secker': 30, + 'kakareko': 30, + 'sikorska': 30, + 'sztoldman': 30, } agree_mailing = forms.BooleanField( label=_('I am interested in receiving information about the Modern Poland Foundation\'s activities by e-mail'), required=False) - agree_data = forms.BooleanField( - label=_('Permission for data processing'), - help_text=_( - u'I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. Marszałkowska 84/92, ' - u'00-514 Warszawa) permission to process my personal data (name, e-mail address) for purposes of ' - u'registration for CopyCamp conference.')) agree_license = forms.BooleanField( label=_('Permission for publication'), help_text=mark_safe_lazy(_( @@ -392,11 +382,11 @@ class WorkshopForm(ContactForm): for workshop in self.start_workshops: if contact.body.get('w_%s' % workshop, False): counts[workshop] += 1 - if workshop == 'youtube' and counts[workshop] == 30: - send_mail(u'Warsztaty YouTube', u'Przekroczono limit 30 osób na warsztaty YouTube', - 'no-reply@copycamp.pl', - ['krzysztof.siewicz@nowoczesnapolska.org.pl'], - fail_silently=True) + # if workshop == 'youtube' and counts[workshop] == 30: + # send_mail(u'Warsztaty YouTube', u'Przekroczono limit 30 osób na warsztaty YouTube', + # 'no-reply@copycamp.pl', + # ['krzysztof.siewicz@nowoczesnapolska.org.pl'], + # fail_silently=True) some_full = False for k, v in counts.items(): diff --git a/prawokultury/countries.py b/prawokultury/countries.py index 8f95ff6..22e3287 100644 --- a/prawokultury/countries.py +++ b/prawokultury/countries.py @@ -260,7 +260,7 @@ COUNTRIES = [ TRAVEL_GRANT_COUNTRIES = [ # u"Czech Republic", - u"Germany", + # u"Germany", # u"Hungary", # u"Poland", # u"Slovakia", diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index 5a4b949efaf3e087d356ed8d9e1b21bcffcf9b12..46945241a112fe70345d4373b15c26a7a8db89ff 100644 GIT binary patch delta 2963 zcma*oe@sqYX zF6O3bQ!CV3v)o;3mO35TKbksMTjr1DKdd#Uu0L9Bwca1@sby=eXMTA-&$;J0=lSt{ zj{7}#>cY3u;&vIzI$|(!(PhlrxG|nTl>3RsjKT+)hXa$0c@1Y`GG4_@yotRqmWwh0 zr(mkno`)5*Yn}Fj+5~qet@@;v6^kE#*~_{F}tWNFl zwZvcJF#HuY^9-gr20L*GUUk~{Q2ht7EE-@oYGsOWAWp*mSc_pT?HVfDn|E?>wA{TH;1jj=YZQ{|V;eFR1=m>Cp);z!|hxV=;E7v;L)2zT?8H z*ndEDZ}*}`{vIlcj^a4Hiz{$A(_ppDi^wIj6ZOFNF&=ND`gbF{Xda;UJci|!DX4zw z8LYqdsDKOFyK>|Jm`YT~**F51qdIOvZOK+-%;pW$3lE|CA4Q#_2o~WLWYLU^4Ojnx zsFlh@t=!x&6^%6L+^`Atz^$m$uoH*kKGZ-yLoNL+RFb9eHVr5P^#Tijj3FM33zv zTu*yQCfkR*FoZXdJTwa!-4*nr1~Q5DFVp#-MnyRgcHD{DvxAN&P%pZKY^O;%XhT-pyo1~D95N>}H=7Cbe&eU2CEAX9a3^YSkKrSD7A?Gh zY`f{kQgr1+mv{cRU^13!#<&c~=19Y-beX=IG%I%-Q2IZC>3 zI_kbzVJezwHOAmfqKVKfRuVo!Wevf$nKnW%Y$e>pTEa!xL<6Cs+(_xEk=!`LsVjMh z5#@viq0+k~YEOoHJMP903hU53?OYX%tS37(em2_7CN!r-go<)oMH!(oCrZzHYVH16 zo^&oKQ-Vai({9Ek`Xa2OqEE|6Lg}Lg*KR&XXtzCtc2T8{;J-VwR1J!sNF(MFm4p_# zmQWgN!^#L1ZLUftp^Z{`hUl#?0$&#M6rqhtB~}y3gvxYc1<{94rs&gBLChnR<5dKk z{ZP?=T?>hNqJ^-Co@_!L%;iKD(Nj9MB=)PAgU9mutqOlri!bPne3ZT@CUJ>#YcS#(c-fUSDX*Z|Dl94; zHz9Ik@Fmw@v#a)XZ3#6r=UT;9tNV*no_1eD!0&5zYl@`>1)AVE{FnLJb#{o`O8#d* zzuU6w+ANRX=dSl!9Ve`Pk)^{&xgy??r(+}2vp2_OFL4Kg?ICx_s_WXLaagSZd%fG! iZu>V_t+wU%H~AV`g3WD_^SSewpL6$yNNRrHxIX}V;dxvD delta 3049 zcmb8xeQZ-z7{~E5R$c~!jUg~l zh{NzAj>B(JdKfLE<_*Rg*?k_M~0Z4dG}#G$A?i1`xJ|LzWIp`&o(}$euK;7t1)ShS{ZCYtFQa!UARrB?EJ5b|7 zsM747O#W4~{hVOqnd8b%8PWVjagJ z25a0?_z1p+T38z!NB0k)#-}3r&US3$#NGMhGdP#ykMqYxHaDOIH*mKw7gypbJc-3jUo(6cwb{;~-sgg=bFb@S zOmIAWx-nm23YXzFW)sI3k^N|NLPx2)8})$4 zP&Gb;O4U)ccnsMN<{U1>OSk}QXXjSlh04ea*n|~xjJXN7qOLoF3^C_X_Zh|PwExUZ zI_=nkWXT*rttf-~9{2=RqABdadb}0y!TWIp4y(z1Z+}#^Hw?$(Xe_{+RR2yw8*C%7jZg~`lrg)L^+1oWxM4nn1(^5$m35^aQn2EYD*M03CJts0%9=8+79mt_KcVWVIfOE}UI(-gq0HYxEGLxZ zbwnAViZv5z`YKRm_?F0S8891&(fSJDt0nt~O((|?+PtH5K)aE+lPD$hw@CYD8L^7k zOspWNa<;MkvMu|P(CZ+2h^fSF#5AIjXeTO&Y#Z2DG;XQhXSKVCCF=aAu@AHVCF%WL zlmDy>7Za_-HH4e~rl@(yz!SyC(kn(66&7!Eqi#pP?TR|#_`uZCNhw>otS=mJ{N0XS z?Ik>a(v5{3yTVQP1zjVm8#T4`N=}>9qkT?%2w(6LPDpTOD$Oz1C?C1fpCw%XWHE z8|jNiyqFuaUZ;(^UBOs9>cn+Jec0kf`dge(#QME(C#wki-I{c3Y1fdF?0xeO42HYX zhs$>O(rpvh6r^7$f4^{KV|87VojZSFLsNS96{iaaGWOYYa9UMiYJGpydE4bx>4S7NTHl`i!2QTJzcnS3?gP~yN@hYxQCW5gZugW@FgpH8B zc)xXf-JW>V3kUtlu-i>yxM$Mlv&>`uPIK!&dA61RBhLxTQ!~4gJ$*JwmbzVK$={vX nHLzy(q=K6Cqtj0g8TYSc\n" "Language-Team: FNP \n" @@ -39,7 +39,7 @@ msgstr "E-mail" msgid "Organization" msgstr "Organizacja" -#: contact_forms.py:40 +#: contact_forms.py:40 contact_forms.py:303 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:373 +#: contact_forms.py:135 contact_forms.py:363 msgid "Permission for publication" msgstr "Zgoda na publikację" -#: contact_forms.py:137 contact_forms.py:375 +#: contact_forms.py:137 contact_forms.py:365 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:386 +#: contact_forms.py:151 contact_forms.py:376 #, python-format msgid "I accept Terms and Conditions of CopyCamp" msgstr "Akceptuję Regulamin CopyCampu" @@ -394,45 +394,27 @@ msgstr "Imię i nazwisko" msgid "Workshop" msgstr "Warsztat" -#: contact_forms.py:302 -msgid "Country" -msgstr "Kraj" - -#: contact_forms.py:305 +#: contact_forms.py:306 msgid "

I'll take a part in workshops

" msgstr "

Wezmę udział w warsztatach

" -#: contact_forms.py:306 +#: contact_forms.py:307 msgid "Only workshops with any spots left are visible here." msgstr "Widoczne są tylko warsztaty, w których są jeszcze miejsca." -#: contact_forms.py:308 -msgid "Thursday, September 28th, 10 a.m.–12 noon" -msgstr "" - -#: contact_forms.py:315 -msgid "Thursday, September 28th, 12 noon–2 p.m." -msgstr "" +#: contact_forms.py:309 +msgid "Friday, October 5th, 11 a.m.–1 p.m." +msgstr "Piątek, 5 października, 11:00–13:00" #: contact_forms.py:319 -msgid "Friday, September 29th, 9 a.m.–11 noon" -msgstr "" - -#: contact_forms.py:324 -msgid "" -"Please describe the most important recent changes to copyright user rights " -"in your national law. (max 1500 characters)" -msgstr "" - -#: contact_forms.py:328 -msgid "Friday, September 29th, 10 a.m.–12 noon" -msgstr "" +msgid "The workshop will be conducted in English." +msgstr "Warsztat będzie prowadzony po angielsku." -#: contact_forms.py:333 -msgid "Friday, September 29th, 12 noon–2 p.m." -msgstr "" +#: contact_forms.py:321 +msgid "Saturday, October 6th, 11 a.m.–1 p.m." +msgstr "Sobota, 6 października, 11:00–13:00" -#: contact_forms.py:364 +#: contact_forms.py:360 msgid "" "I am interested in receiving information about the Modern Poland " "Foundation's activities by e-mail" @@ -440,25 +422,11 @@ msgstr "" "Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących " "działalności Fundacji Nowoczesna Polska" -#: contact_forms.py:367 -msgid "Permission for data processing" -msgstr "Zgoda na przetwarzanie danych" - -#: contact_forms.py:369 -msgid "" -"I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. " -"Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data " -"(name, e-mail address) for purposes of registration for CopyCamp conference." -msgstr "" -"Wyrażam zgodę na przetwarzanie moich danych osobowych (imię, nazwisko, adres " -"poczty elektronicznej) przez Fundację Nowoczesna Polska (ul. Marszałkowska " -"84/92, 00-514 Warszawa) w związku z rejestracją na konferencję CopyCamp." - -#: contact_forms.py:413 +#: contact_forms.py:403 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:415 +#: contact_forms.py:405 msgid "Please choose at least one workshop." msgstr "Proszę wybrać co najmniej jeden warsztat." @@ -494,6 +462,10 @@ msgstr "CopyCamp" msgid "Search" msgstr "Szukaj" +#: templates/base.html:68 +msgid "Workshops" +msgstr "Warsztaty" + #: templates/base.html:106 msgid "" "If not explicitly stated otherwise, all texts are licensed under the