From: Jan Szejko Date: Wed, 14 Jun 2017 08:18:15 +0000 (+0200) Subject: remind me form - thanks and no emails X-Git-Url: https://git.mdrn.pl/prawokultury.git/commitdiff_plain/94844345dfed48adec1da56cd29d98e92b84ed2f remind me form - thanks and no emails --- diff --git a/contact/forms.py b/contact/forms.py index 6bb49fe..419540a 100644 --- a/contact/forms.py +++ b/contact/forms.py @@ -34,6 +34,7 @@ class ContactForm(forms.Form): submit_label = _('Submit') admin_list = None notify_on_register = True + notify_user = True required_css_class = 'required' contact = forms.EmailField(label=_('E-mail'), max_length=128) @@ -93,17 +94,18 @@ class ContactForm(forms.Form): except ValidationError: pass else: - mail_subject = render_to_string([ - 'contact/%s/mail_subject.txt' % self.form_tag, - 'contact/mail_subject.txt', - ], dictionary, context).strip() - mail_body = render_to_string([ - 'contact/%s/mail_body.txt' % self.form_tag, - 'contact/mail_body.txt', - ], dictionary, context) - send_mail(mail_subject, mail_body, - 'no-reply@%s' % site.domain, - [contact.contact], - fail_silently=True) + if self.notify_user: + mail_subject = render_to_string([ + 'contact/%s/mail_subject.txt' % self.form_tag, + 'contact/mail_subject.txt', + ], dictionary, context).strip() + mail_body = render_to_string([ + 'contact/%s/mail_body.txt' % self.form_tag, + 'contact/mail_body.txt', + ], dictionary, context) + send_mail(mail_subject, mail_body, + 'no-reply@%s' % site.domain, + [contact.contact], + fail_silently=True) return contact diff --git a/prawokultury/contact_forms.py b/prawokultury/contact_forms.py index 3848a68..0a2cec0 100644 --- a/prawokultury/contact_forms.py +++ b/prawokultury/contact_forms.py @@ -273,6 +273,8 @@ 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): diff --git a/prawokultury/locale/pl/LC_MESSAGES/django.mo b/prawokultury/locale/pl/LC_MESSAGES/django.mo index 43b325b..ba85642 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 c9e83eb..1a049b9 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: 2017-04-27 10:38+0200\n" +"POT-Creation-Date: 2017-06-14 10:00+0200\n" "PO-Revision-Date: 2014-09-30 16:25+0100\n" "Last-Translator: Radek Czajka \n" "Language-Team: FNP \n" @@ -19,7 +19,7 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.5.4\n" -#: contact_forms.py:23 +#: contact_forms.py:23 templates/base.html:61 msgid "Registration" msgstr "Rejestracja" @@ -31,16 +31,16 @@ msgstr "Imię" msgid "Last name" msgstr "Nazwisko" -#: contact_forms.py:28 contact_forms.py:277 contact_forms.py:289 +#: contact_forms.py:28 contact_forms.py:283 contact_forms.py:295 msgid "E-mail" msgstr "E-mail" -#: contact_forms.py:29 contact_forms.py:197 contact_forms.py:278 -#: contact_forms.py:290 +#: contact_forms.py:29 contact_forms.py:197 contact_forms.py:284 +#: contact_forms.py:296 msgid "Organization" msgstr "Organizacja" -#: contact_forms.py:31 contact_forms.py:292 +#: contact_forms.py:31 contact_forms.py:298 msgid "Country" msgstr "Kraj" @@ -262,7 +262,7 @@ msgstr "konkretna(y) prelegentka(ent)" msgid "good networking occasion" msgstr "możliwość networkingu" -#: contact_forms.py:120 contact_forms.py:200 contact_forms.py:340 +#: contact_forms.py:120 contact_forms.py:200 contact_forms.py:346 msgid "" "I am interested in receiving information about the Modern Poland " "Foundation's activities by e-mail" @@ -270,11 +270,11 @@ msgstr "" "Jestem zainteresowana/y otrzymywaniem drogą mailową informacji dotyczących " "działalności Fundacji Nowoczesna Polska" -#: contact_forms.py:124 contact_forms.py:343 +#: contact_forms.py:124 contact_forms.py:349 msgid "Permission for data processing" msgstr "Zgoda na przetwarzanie danych" -#: contact_forms.py:125 contact_forms.py:345 +#: contact_forms.py:125 contact_forms.py:351 msgid "" "I hereby grant Modern Poland Foundation (Fundacja Nowoczesna Polska, ul. " "Marszałkowska 84/92, 00-514 Warszawa) permission to process my personal data " @@ -284,11 +284,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:128 contact_forms.py:204 contact_forms.py:349 +#: contact_forms.py:128 contact_forms.py:204 contact_forms.py:355 msgid "Permission for publication" msgstr "Zgoda na publikację" -#: contact_forms.py:129 contact_forms.py:205 contact_forms.py:351 +#: contact_forms.py:129 contact_forms.py:205 contact_forms.py:357 msgid "" "I agree to having materials, recorded during the conference, released under " "the terms of CC BY-SA oraz rozpowszechnianie wizerunku." -#: contact_forms.py:141 contact_forms.py:363 +#: contact_forms.py:141 contact_forms.py:369 #, python-format msgid "I accept Terms and Conditions of CopyCamp" msgstr "Akceptuję Regulamin CopyCampu" @@ -405,35 +405,35 @@ msgid "" "Conditions." msgstr "Akceptuję regulamin CopyCampu" -#: contact_forms.py:274 +#: contact_forms.py:280 msgid "Next CopyCamp" msgstr "Kolejny CopyCamp" -#: contact_forms.py:276 contact_forms.py:288 +#: contact_forms.py:282 contact_forms.py:294 msgid "Name" msgstr "Imię i nazwisko" -#: contact_forms.py:286 +#: contact_forms.py:292 msgid "Workshop" msgstr "Warsztat" -#: contact_forms.py:295 +#: contact_forms.py:301 msgid "

I'll take a part in workshops

" msgstr "

Wezmę udział w warsztatach

" -#: contact_forms.py:296 +#: contact_forms.py:302 msgid "Only workshops with any spots left are visible here." msgstr "Widoczne są tylko warsztaty, w których są jeszcze miejsca." -#: contact_forms.py:298 +#: contact_forms.py:304 msgid "Thursday, October 27th, 10 a.m.–12 noon" msgstr "Czwartek, 27 października, 10:00–12:00" -#: contact_forms.py:300 +#: contact_forms.py:306 msgid "Dimitar Dimitrov: Hacking Brussels" msgstr "Dimitar Dimitrov: Hacking Brussels (warsztat w języku angielskim)" -#: contact_forms.py:302 +#: contact_forms.py:308 msgid "" "Stef van Gompel: Methods and constraints for including evidence in IP " "lawmaking" @@ -441,11 +441,11 @@ msgstr "" "Stef van Gompel: Methods and constraints for including evidence in IP " "lawmaking (warsztat w języku angielskim)" -#: contact_forms.py:304 +#: contact_forms.py:310 msgid "Friday, October 28th, 10 a.m.–12 noon" msgstr "Piątek, 28 października, 10:00–12:00" -#: contact_forms.py:307 +#: contact_forms.py:313 msgid "" "dr Krzysztof Siewicz, dr Marta Hoffman-Sommer: Legal aspects of using " "research data in the age of Open Data" @@ -453,15 +453,15 @@ msgstr "" "dr Krzysztof Siewicz, dr Marta Hoffman-Sommer: Legal aspects of using " "research data in the age of Open Data (warsztat w języku angielskim)" -#: contact_forms.py:321 +#: contact_forms.py:327 msgid "Marcin Olender, Google: Prawo autorskie na YouTube (workshop in Polish)" msgstr "Marcin Olender, Google: Prawo autorskie na YouTube" -#: contact_forms.py:323 +#: contact_forms.py:329 msgid "Friday, October 28th, 12 noon–2 p.m." msgstr "Piątek, 28 października, 12:00–14:00" -#: contact_forms.py:326 +#: contact_forms.py:332 msgid "" "Mateusz Górski, Michał Leksiński, Patronite: Jak zarabiać i się nie sprzedać " "– warsztaty dla twórców (workshop in Polish)" @@ -469,23 +469,23 @@ msgstr "" "Mateusz Górski, Michał Leksiński, Patronite: Jak zarabiać i się nie sprzedać " "– warsztaty dla twórców" -#: contact_forms.py:331 +#: contact_forms.py:337 msgid "" "Olga Goriunova: The Lurker and the politics of knowledge in data culture" msgstr "" "Olga Goriunova: The Lurker and the politics of knowledge in data culture " "(warsztat w języku angielskim)" -#: contact_forms.py:384 +#: contact_forms.py:390 msgid "Please submit your answer to qualify for this workshop" msgstr "" "Zamieść odpowiedź na zadanie, aby móc się zakwalifikować na ten warsztat" -#: contact_forms.py:387 +#: contact_forms.py:393 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:389 +#: contact_forms.py:395 msgid "Please choose at least one workshop." msgstr "Proszę wybrać co najmniej jeden warsztat." @@ -584,12 +584,16 @@ msgstr "Dziękujemy za zgłoszenie." #: templates/contact/register-speaker/thanks.html:8 msgid "" -"Your submission can be modified until June 11th using the unique link sent to " -"you by e-mail." +"Your submission can be modified until June 11th using the unique link sent " +"to you by e-mail." msgstr "" "Zgłoszenie można modyfikować do 11 czerwca używając unikalnego adresu " "przesłanego e-mailem." +#: templates/contact/remind-me/thanks.html:6 +msgid "Thank you for submitting your e-mail address." +msgstr "Dziękujemy za zostawienie adresu e-mail." + #: templates/contact/workshop/mail_body.txt:2 msgid "Thank you for registering to the workshop. Please arrive on time." msgstr "Dziękujemy za rejestrację na warsztat. Prosimy o punktualne przybycie." diff --git a/prawokultury/templates/contact/remind-me/thanks.html b/prawokultury/templates/contact/remind-me/thanks.html new file mode 100644 index 0000000..11915b5 --- /dev/null +++ b/prawokultury/templates/contact/remind-me/thanks.html @@ -0,0 +1,8 @@ +{% extends "contact/thanks.html" %} +{% load i18n %} + +{% block contact_form_description %} + +

{% trans "Thank you for submitting your e-mail address." %}

+ +{% endblock %}