X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/4e361d55331351f56077e5f9999ecb4ee7e93819..7e819d97960b7df890ca60e4717fc6efc3163593:/src/suggest/forms.py

diff --git a/src/suggest/forms.py b/src/suggest/forms.py
index 90d3b9896..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
@@ -20,7 +20,7 @@ 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'''\
+    data_processing_part2 = '''\
 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.'''
 
@@ -34,7 +34,7 @@ adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnyc
             suggestion.user = request.user
         suggestion.save()
 
-        mail_managers(u'Nowa sugestia na stronie WolneLektury.pl', u'''\
+        mail_managers('Nowa sugestia na stronie WolneLektury.pl', '''\
 Zgłoszono nową sugestię w serwisie WolneLektury.pl.
 http://%(site)s%(url)s
 
@@ -55,8 +55,8 @@ Kontakt: %(contact)s
             pass
         else:
             send_noreply_mail(
-                ugettext(u'Thank you for your suggestion.'),
-                ugettext(u"""\
+                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(u"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()
@@ -94,7 +94,7 @@ class PublishingSuggestForm(NewsletterForm):
         suggestion.save()
 
         if not suggestion.is_spam():
-            mail_managers(u'Konsultacja planu wydawniczego na WolneLektury.pl', u'''\
+            mail_managers('Konsultacja planu wydawniczego na WolneLektury.pl', '''\
     Zgłoszono nową sugestię nt. planu wydawniczego w serwisie WolneLektury.pl.
     %(url)s
 
@@ -106,7 +106,7 @@ class PublishingSuggestForm(NewsletterForm):
 
     Audiobooki:
     %(audiobooks)s''' % {
-                'url': request.build_absolute_uri(reverse('admin:suggest_suggestion_change', args=[suggestion.id])),
+                'url': request.build_absolute_uri(reverse('admin:suggest_publishingsuggestion_change', args=[suggestion.id])),
                 'user': str(request.user) if request.user.is_authenticated else '',
                 'contact': contact,
                 'books': books,
@@ -119,8 +119,8 @@ class PublishingSuggestForm(NewsletterForm):
                 pass
             else:
                 send_noreply_mail(
-                    ugettext(u'Thank you for your suggestion.'),
-                    ugettext(u"""\
+                    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)