X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/652e2d66d7f88cc6b857edc4aaac7e14a654eb36..c0a7799619e217e2eac724b1a688ad37f0182253:/src/suggest/forms.py diff --git a/src/suggest/forms.py b/src/suggest/forms.py index 452180559..72fd31124 100644 --- 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. # @@ -6,13 +5,14 @@ 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.core.urlresolvers import reverse 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 newsletter.forms import NewsletterForm from suggest.models import PublishingSuggestion, Suggestion +from wolnelektury.utils import send_noreply_mail class SuggestForm(NewsletterForm): @@ -20,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) + 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'] @@ -50,12 +54,12 @@ 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(NewsletterForm): @@ -65,6 +69,8 @@ class PublishingSuggestForm(NewsletterForm): 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.") @@ -112,10 +118,9 @@ class PublishingSuggestForm(NewsletterForm): 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) +The suggestion has been referred to the project coordinator."""), + [contact], fail_silently=True)