Merge branch 'master' into production

[wolnelektury.git] / apps / suggest / forms.py

diff --git a/apps/suggest/forms.py b/apps/suggest/forms.py
index b7c614f..1a55543 100644 (file)
--- a/apps/suggest/forms.py
+++ b/apps/suggest/forms.py
@@ -3,12 +3,12 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms

+from django.contrib.sites.models import Site

 from django.core.mail import send_mail, mail_managers
 from django.core.urlresolvers import reverse
 from django.core.validators import email_re
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from django.core.mail import send_mail, mail_managers
 from django.core.urlresolvers import reverse
 from django.core.validators import email_re
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext

-

 from suggest.models import PublishingSuggestion, Suggestion
 
 
 from suggest.models import PublishingSuggestion, Suggestion
 
 


@@ -42,14 +42,15 @@ Kontakt: %(contact)s
             }, fail_silently=True)
 
         if email_re.match(contact):
             }, fail_silently=True)
 
         if email_re.match(contact):

-            send_mail(u'[WolneLektury] ' + _(u'Thank you for your suggestion.'),
-                    _(u"""\
+            send_mail(u'[WolneLektury] ' +
+                    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"""
 
 -- 
 Thank you for your comment on WolneLektury.pl.
 The suggestion has been referred to the project coordinator.""") +
 u"""
 
 -- 

-""" + _(u'''Message sent automatically. Please do not reply.'''),
+""" + ugettext(u'''Message sent automatically. Please do not reply.'''),

                     'no-reply@wolnelektury.pl', [contact], fail_silently=True)
 
 
                     'no-reply@wolnelektury.pl', [contact], fail_silently=True)
 
 


@@ -60,7 +61,7 @@ class PublishingSuggestForm(forms.Form):
 
     def clean(self, *args, **kwargs):
         if not self.cleaned_data['books'] and not self.cleaned_data['audiobooks']:
 
     def clean(self, *args, **kwargs):
         if not self.cleaned_data['books'] and not self.cleaned_data['audiobooks']:

-            msg = _(u"One of these fields is required.")
+            msg = ugettext(u"One of these fields is required.")

             self._errors["books"] = self.error_class([msg])
             self._errors["audiobooks"] = self.error_class([msg])
         return super(PublishingSuggestForm, self).clean(*args, **kwargs)
             self._errors["books"] = self.error_class([msg])
             self._errors["audiobooks"] = self.error_class([msg])
         return super(PublishingSuggestForm, self).clean(*args, **kwargs)