Update Celery to 4.3

[wolnelektury.git] / src / suggest / forms.py

diff --git a/src/suggest/forms.py b/src/suggest/forms.py
index 717cbc7..72fd311 100644 (file)
--- a/src/suggest/forms.py
+++ b/src/suggest/forms.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -6,8 +5,8 @@ from django import forms
 from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
 from django.core.mail import send_mail, mail_managers
 from django.contrib.sites.models import Site
 from django.core.exceptions import ValidationError
 from django.core.mail import send_mail, mail_managers

-from django.core.urlresolvers import reverse

 from django.core.validators import validate_email
 from django.core.validators import validate_email

+from django.urls import reverse

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 


@@ -21,6 +20,10 @@ class SuggestForm(NewsletterForm):
     contact = forms.CharField(label=_('Contact'), max_length=120, required=False)
     description = forms.CharField(label=_('Description'), widget=forms.Textarea, required=True)
 
     contact = forms.CharField(label=_('Contact'), max_length=120, required=False)
     description = forms.CharField(label=_('Description'), widget=forms.Textarea, required=True)
 

+    data_processing_part2 = u'''\
+Dane są przetwarzane w zakresie niezbędnym do obsługi zgłoszenia. W przypadku wyrażenia dodatkowej zgody \
+adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnych Lektur.'''
+

     def save(self, request):
         super(SuggestForm, self).save()
         contact = self.cleaned_data['contact']
     def save(self, request):
         super(SuggestForm, self).save()
         contact = self.cleaned_data['contact']


@@ -66,6 +69,8 @@ class PublishingSuggestForm(NewsletterForm):
     ebook = forms.BooleanField(label=_('ebook'), required=False, initial=True)
     audiobook = forms.BooleanField(label=_('audiobook'), required=False)
 
     ebook = forms.BooleanField(label=_('ebook'), required=False, initial=True)
     audiobook = forms.BooleanField(label=_('audiobook'), required=False)
 

+    data_processing_part2 = SuggestForm.data_processing_part2
+

     def clean(self):
         if not self.cleaned_data['ebook'] and not self.cleaned_data['audiobook']:
             msg = ugettext(u"One of these options is required.")
     def clean(self):
         if not self.cleaned_data['ebook'] and not self.cleaned_data['audiobook']:
             msg = ugettext(u"One of these options is required.")


@@ -113,7 +118,7 @@ class PublishingSuggestForm(NewsletterForm):
             except ValidationError:
                 pass
             else:
             except ValidationError:
                 pass
             else:

-                send_mail(
+                send_noreply_mail(

                     ugettext(u'Thank you for your suggestion.'),
                     ugettext(u"""\
 Thank you for your comment on WolneLektury.pl.
                     ugettext(u'Thank you for your suggestion.'),
                     ugettext(u"""\
 Thank you for your comment on WolneLektury.pl.