X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c0a7799619e217e2eac724b1a688ad37f0182253..7a27a3fbc14b2049b8d110db15855a625e4c2455:/src/suggest/forms.py?ds=sidebyside

diff --git a/src/suggest/forms.py b/src/suggest/forms.py
index 72fd31124..09122273b 100644
--- a/src/suggest/forms.py
+++ b/src/suggest/forms.py
@@ -1,5 +1,5 @@
-# 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 Wolne Lektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Wolne Lektury. See NOTICE for more information.
 #
 from django import forms
 from django.contrib.sites.models import Site
@@ -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
@@ -17,12 +17,12 @@ from wolnelektury.utils import send_noreply_mail
 
 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)
+    contact = forms.CharField(label=_('Kontakt'), max_length=120, required=False)
+    description = forms.CharField(label=_('Opis'), 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.'''
+adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnych Lektur.''')
 
     def save(self, request):
         super(SuggestForm, self).save()
@@ -30,11 +30,11 @@ adres e-mail zostanie wykorzystany także w celu przesyłania newslettera Wolnyc
         description = self.cleaned_data['description']
 
         suggestion = Suggestion(contact=contact, description=description, ip=request.META['REMOTE_ADDR'])
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             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
 
@@ -44,7 +44,7 @@ Kontakt: %(contact)s
 %(description)s''' % {
             'site': Site.objects.get_current().domain,
             'url': reverse('admin:suggest_suggestion_change', args=[suggestion.id]),
-            'user': str(request.user) if request.user.is_authenticated() else '',
+            'user': str(request.user) if request.user.is_authenticated else '',
             'contact': contact,
             'description': description,
             }, fail_silently=True)
@@ -55,25 +55,25 @@ Kontakt: %(contact)s
             pass
         else:
             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."""),
+                gettext('Dziękujemy za zgłoszenie.'),
+                gettext("""\
+Dziękujemy za zgłoszenie uwag do serwisu Wolne Lektury.
+Sugestia została przekazana koordynatorce projektu."""),
                 [contact], fail_silently=True)
 
 
 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)
+    contact = forms.CharField(label=_('Kontakt'), max_length=120, required=False)
+    books = forms.CharField(label=_('książki'), widget=forms.Textarea, required=True)
+    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("Proszę zaznaczyć co najmniej jedną opcję.")
             self._errors['ebook'] = self.error_class([msg])
             self._errors['audiobook'] = self.error_class([msg])
         return super(PublishingSuggestForm, self).clean()
@@ -89,12 +89,12 @@ class PublishingSuggestForm(NewsletterForm):
         suggestion = PublishingSuggestion(
             contact=contact, books=books,
             audiobooks=audiobooks, ip=request.META['REMOTE_ADDR'])
-        if request.user.is_authenticated():
+        if request.user.is_authenticated:
             suggestion.user = request.user
         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,8 +106,8 @@ class PublishingSuggestForm(NewsletterForm):
 
     Audiobooki:
     %(audiobooks)s''' % {
-                'url': request.build_absolute_uri(reverse('admin:suggest_suggestion_change', args=[suggestion.id])),
-                'user': str(request.user) if request.user.is_authenticated() else '',
+                '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,
                 'audiobooks': audiobooks,
@@ -119,8 +119,8 @@ class PublishingSuggestForm(NewsletterForm):
                 pass
             else:
                 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."""),
+                    gettext('Dziękujemy za zgłoszenie.'),
+                    gettext("""\
+Dziękujemy za zgłoszenie uwag do serwisu Wolne Lektury.
+Sugestia została przekazana koordynatorce projektu."""),
                     [contact], fail_silently=True)