X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f3c334d8fbb682677d059308501ea57a4c7581ee..3a2793b0c0d892fa497007c3466943de3de5a752:/src/suggest/forms.py diff --git a/src/suggest/forms.py b/src/suggest/forms.py index 4e9cf2f2a..cfcaab566 100644 --- a/src/suggest/forms.py +++ b/src/suggest/forms.py @@ -10,14 +10,23 @@ from django.core.urlresolvers import reverse from django.core.validators import validate_email from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext + +from newsletter.forms import NewsletterForm from suggest.models import PublishingSuggestion, Suggestion +from wolnelektury.utils import send_noreply_mail -class SuggestForm(forms.Form): +class SuggestForm(NewsletterForm): + email_field = 'contact' 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'] description = self.cleaned_data['description'] @@ -46,20 +55,23 @@ Kontakt: %(contact)s except ValidationError: pass else: - send_mail(u'[WolneLektury] ' + ugettext(u'Thank you for your suggestion.'), - ugettext(u"""\ + send_noreply_mail( + ugettext(u'Thank you for your suggestion.'), + ugettext(u"""\ Thank you for your comment on WolneLektury.pl. -The suggestion has been referred to the project coordinator.""") + - u'\n\n-- \n' + ugettext(u'''Message sent automatically. Please do not reply.'''), - 'no-reply@wolnelektury.pl', [contact], fail_silently=True) +The suggestion has been referred to the project coordinator."""), + [contact], fail_silently=True) -class PublishingSuggestForm(forms.Form): +class PublishingSuggestForm(NewsletterForm): + email_field = 'contact' contact = forms.CharField(label=_('Contact'), max_length=120, required=False) books = forms.CharField(label=_('books'), widget=forms.Textarea, required=True) 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.") @@ -68,6 +80,7 @@ class PublishingSuggestForm(forms.Form): return super(PublishingSuggestForm, self).clean() def save(self, request): + super(PublishingSuggestForm, self).save() contact = self.cleaned_data['contact'] suggestion_text = self.cleaned_data['books'].strip(', \n\r') @@ -106,10 +119,9 @@ class PublishingSuggestForm(forms.Form): except ValidationError: pass else: - send_mail( - u'[WolneLektury] ' + ugettext(u'Thank you for your suggestion.'), + send_noreply_mail( + ugettext(u'Thank you for your suggestion.'), ugettext(u"""\ - Thank you for your comment on WolneLektury.pl. - The suggestion has been referred to the project coordinator.""") + - u"\n\n-- \n" + ugettext(u'''Message sent automatically. Please do not reply.'''), - 'no-reply@wolnelektury.pl', [contact], fail_silently=True) +Thank you for your comment on WolneLektury.pl. +The suggestion has been referred to the project coordinator."""), + [contact], fail_silently=True)