Enable jsmin.

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

diff --git a/apps/suggest/forms.py b/apps/suggest/forms.py
index 1a55543..b98e0ae 100644 (file)
--- a/apps/suggest/forms.py
+++ b/apps/suggest/forms.py
@@ -4,9 +4,10 @@
 #
 from django import forms
 from django.contrib.sites.models import Site
 #
 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.mail import send_mail, mail_managers
 from django.core.urlresolvers import reverse

-from django.core.validators import email_re
+from django.core.validators import validate_email

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from suggest.models import PublishingSuggestion, Suggestion
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from suggest.models import PublishingSuggestion, Suggestion


@@ -41,7 +42,11 @@ Kontakt: %(contact)s
             'description': description,
             }, fail_silently=True)
 
             'description': description,
             }, fail_silently=True)
 

-        if email_re.match(contact):
+        try:
+            validate_email(contact)
+        except ValidationError:
+            pass
+        else:

             send_mail(u'[WolneLektury] ' +
                     ugettext(u'Thank you for your suggestion.'),
                     ugettext(u"""\
             send_mail(u'[WolneLektury] ' +
                     ugettext(u'Thank you for your suggestion.'),
                     ugettext(u"""\


@@ -96,7 +101,11 @@ Audiobooki:
             'audiobooks': audiobooks,
             }, fail_silently=True)
 
             'audiobooks': audiobooks,
             }, fail_silently=True)
 

-        if email_re.match(contact):
+        try:
+            validate_email(contact)
+        except ValidationError:
+            pass
+        else:

             send_mail(u'[WolneLektury] ' +
                     ugettext(u'Thank you for your suggestion.'),
                     ugettext(u"""\
             send_mail(u'[WolneLektury] ' +
                     ugettext(u'Thank you for your suggestion.'),
                     ugettext(u"""\