X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/28e9178ad9b465e89c5a784c31f9201285440962..ea7671fcbd5bd829b16771670263aebaf29c69c1:/src/suggest/forms.py?ds=inline diff --git a/src/suggest/forms.py b/src/suggest/forms.py index b276f0396..6a36fb625 100644 --- a/src/suggest/forms.py +++ b/src/suggest/forms.py @@ -7,8 +7,8 @@ from django.core.exceptions import ValidationError from django.core.mail import send_mail, mail_managers 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 gettext_lazy as _ +from django.utils.translation import gettext from newsletter.forms import NewsletterForm from suggest.models import PublishingSuggestion, Suggestion @@ -55,8 +55,8 @@ Kontakt: %(contact)s pass else: send_noreply_mail( - ugettext('Thank you for your suggestion.'), - ugettext("""\ + gettext('Thank you for your suggestion.'), + gettext("""\ Thank you for your comment on WolneLektury.pl. The suggestion has been referred to the project coordinator."""), [contact], fail_silently=True) @@ -66,14 +66,14 @@ 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) + ebook = forms.BooleanField(label=_('ebook'), required=False, initial=True, label_suffix='') + audiobook = forms.BooleanField(label=_('audiobook'), required=False, label_suffix='') data_processing_part2 = SuggestForm.data_processing_part2 def clean(self): if not self.cleaned_data['ebook'] and not self.cleaned_data['audiobook']: - msg = ugettext("One of these options is required.") + msg = gettext("One of these options is required.") self._errors['ebook'] = self.error_class([msg]) self._errors['audiobook'] = self.error_class([msg]) return super(PublishingSuggestForm, self).clean() @@ -119,8 +119,8 @@ class PublishingSuggestForm(NewsletterForm): pass else: send_noreply_mail( - ugettext('Thank you for your suggestion.'), - ugettext("""\ + gettext('Thank you for your suggestion.'), + gettext("""\ Thank you for your comment on WolneLektury.pl. The suggestion has been referred to the project coordinator."""), [contact], fail_silently=True)