From 077f4784b82b151dde0097ed7c2b2aefcf232ea6 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 6 Jul 2016 12:44:49 +0200 Subject: [PATCH 1/1] corrections in register speaker form --- prawokultury/contact_forms.py | 13 +++++- prawokultury/locale/pl/LC_MESSAGES/django.mo | Bin 7415 -> 7617 bytes prawokultury/locale/pl/LC_MESSAGES/django.po | 37 ++++++++++++------ .../contact/register-speaker/form.html | 1 + 4 files changed, 36 insertions(+), 15 deletions(-) diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py index cba3fe2..91cb5fd 100644 --- a/prawokultury/contact_forms.py +++ b/prawokultury/contact_forms.py @@ -112,6 +112,14 @@ class RegisterSpeaker(RegistrationForm): required=False ) + agree_data = None + + agree_terms = forms.BooleanField( + label=_('Terms and Conditions'), + help_text=mark_safe_lazy(_(u'I accept ' + u'CopyCamp Terms and Conditions.')) + ) + # workshop = forms.BooleanField(label=_('Workshop'), required=False) # workshop_title = forms.CharField(label=_('Title of workshop'), # max_length=256, required=False) @@ -141,8 +149,9 @@ class RegisterSpeaker(RegistrationForm): # 'workshop_summary', 'agree_mailing', - 'agree_data', - 'agree_license' + # 'agree_data', + 'agree_license', + 'agree_terms', ] def clean(self): diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index e9108baba1d09b068ce48958528a13c57cbc12cc..f6763c8d854181d57265e4b7fc82585c93183bed 100644 GIT binary patch delta 1511 zcmZwHT};h!9LMqBae7b+6{-{UR}@l52SrbuWrj6YOU7(=suKsD&Q6&zWM(s&hl!1i z&4rtWT%5Jpbi-QNxZr}a85fmN7cSV`;r;n{G8ewv@8Ux2!!#Vk6dXktPNIdeamK`BKJsUZ`B{YP zF~gWHQ_DpnH~d(RA#A`0IE4Co8w_I;&Sy4b*nv-QPXd$EeL5*c7sg;6CSxOJVGAbV zS)7ZPF`Mzt9WFHEr_mSQA(J;_XyMoB{lq!bD@{k{W(qL}J-7ku@c>@JVw}Qd=wj3b zxCv{p0o(8v7BaqxW13#{pc^|eAMaxUzC?Za9am!+(^tnWxDzj;-XBHv^Bc8g-g(B9 z;11k}r%;(0!6}C^AFxX=zF_0d;Tz1xhSX_0P^r6)?3L-mTpY%wIEm^oi2_hYQgAzF z;8tuxWwICD_!z736As~$1?2xA7vtpTIMz~8UvLm#<0C3X6Fie{OeJ1G72jagx2UcA zjAYw5n5Bv`8JA!lD)n9@DW(zCpC6ZFFoXQ-!yC~T@1a)GkLq{;PvZz~z}=a~6yX(I zq35XLn?SAj8(zawKGumE#%<^%jb&Ji%INv1_qw>)%Z&ld$3>jMI;=waGFMTl>&4CZ z9<>4&%hQDNP(`;NwG{)%)*78&UbX8)8JP+7rHm-lkLu5!sb;5GODm>npOpy>qEPzS zZhO@#LJv(fpwPe;je}wb+xs_^W-W}`wa>k>mq#n4t5lWprv2w>PjXULWPHwZXI!aO;wkq;9?t7^7I=?n0>=&y-u`D2 x_6)-QgU62g+5$m_4M(ce4#mXpInfmGhfhZO(?gEL`kCjZ=T~MHhM`TnkBFCF;L=RbGu^8cT6?mVvf=?}b5jtCmz zXJj+Jdd&9Y9WNimY=l`1&fz%>VG<5Snx*0>uEHC*5+^VVr_qNq7>!X;3{2o74O210 zEMUbR&3F@a-AmMYA5k0lkxu^AtqU9&!gN|vH4UOJe1_}wJ8FjonPwO8 z1lHg$Y(hUb*@nZY4Bij>3fuS|!b053kFD5;Txw4POq8k*xC;|`2etAR)I!=&&2x4uOHmn~l%sk|;c4*}zcdNSyoMvJ6$y5{5RWvhgOX{})T3EU-B@)I=2wrA)yq z{9n)-M%CO<^D20e+&XW>EjmDKWzhI;DCJh)-7{F<-r3_$oV3Wx9>*J98+oZBKGW%n xd*Y3%^p#gumpN5Qx4lkIN^3-7OK*4I>B%d;fx(X6_Q?^aKcmOv%xAvv{soTEg~b2> diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.po b/prawokultury/locale/pl/LC_MESSAGES/django.po index b16451a..0c040fd 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: 2016-07-05 15:06+0200\n" +"POT-Creation-Date: 2016-07-06 12:26+0200\n" "PO-Revision-Date: 2014-09-30 16:25+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" @@ -31,11 +31,11 @@ msgstr "Imię" msgid "Last name" msgstr "Nazwisko" -#: contact_forms.py:28 contact_forms.py:165 contact_forms.py:177 +#: contact_forms.py:28 contact_forms.py:174 contact_forms.py:186 msgid "E-mail" msgstr "E-mail" -#: contact_forms.py:29 contact_forms.py:166 contact_forms.py:178 +#: contact_forms.py:29 contact_forms.py:175 contact_forms.py:187 msgid "Organization" msgstr "Organizacja" @@ -51,11 +51,11 @@ msgstr "" "Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących " "działalności Fundacji Nowoczesna Polska" -#: contact_forms.py:46 contact_forms.py:206 +#: contact_forms.py:46 contact_forms.py:215 msgid "Permission for data processing" msgstr "Zgoda na przetwarzanie danych" -#: contact_forms.py:47 contact_forms.py:207 +#: contact_forms.py:47 contact_forms.py:216 msgid "" "I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. " "Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data " @@ -65,11 +65,11 @@ msgstr "" "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:50 contact_forms.py:210 +#: contact_forms.py:50 contact_forms.py:219 msgid "Permission for publication" msgstr "Zgoda na publikację" -#: contact_forms.py:51 contact_forms.py:211 +#: contact_forms.py:51 contact_forms.py:220 msgid "" "I agree to having materials, recorded during the conference, released under " "the terms of CopyCamp Terms and Conditions." +msgstr "" +"Akceptuję regulamin CopyCampu" + +#: contact_forms.py:161 msgid "Fill at least one bio!" msgstr "Wpisz przynajmniej jedną notkę biograficzną (po polsku lub angielsku)!" -#: contact_forms.py:154 +#: contact_forms.py:163 msgid "Fill at least one title!" msgstr "Wpisz przynajmniej jeden tytuł prezentacji (po polsku lub angielsku)!" -#: contact_forms.py:162 +#: contact_forms.py:171 msgid "Next CopyCamp" msgstr "Kolejny CopyCamp" -#: contact_forms.py:164 contact_forms.py:176 +#: contact_forms.py:173 contact_forms.py:185 msgid "Name" msgstr "Imię i nazwisko" -#: contact_forms.py:174 +#: contact_forms.py:183 msgid "Workshop" msgstr "Warsztat" diff --git a/prawokultury/templates/contact/register-speaker/form.html b/prawokultury/templates/contact/register-speaker/form.html index 73c157e..740c9e6 100644 --- a/prawokultury/templates/contact/register-speaker/form.html +++ b/prawokultury/templates/contact/register-speaker/form.html @@ -24,6 +24,7 @@ {% csrf_token %} {{ form.as_table }} +
{% chunk "contact_form__"|add:form.form_tag|add:"__data_processing" %}
-- 2.20.1