Merge branch 'obrazy' into rwd

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

diff --git a/apps/funding/forms.py b/apps/funding/forms.py
index dc0e623..64cceb6 100644 (file)
--- a/apps/funding/forms.py
+++ b/apps/funding/forms.py
@@ -1,9 +1,13 @@
-from django.conf import settings
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django import forms
 from django.utils import formats
 from django.utils.translation import ugettext_lazy as _, ugettext, get_language
 from .models import Funding
 from .widgets import PerksAmountWidget
 from django import forms
 from django.utils import formats
 from django.utils.translation import ugettext_lazy as _, ugettext, get_language
 from .models import Funding
 from .widgets import PerksAmountWidget

+from . import app_settings

 
 
 class FundingForm(forms.Form):
 
 
 class FundingForm(forms.Form):


@@ -14,8 +18,9 @@ class FundingForm(forms.Form):
     name = forms.CharField(label=_("Name"), required=False,
         help_text=_("Optional name for public list of contributors"))
     email = forms.EmailField(label=_("Contact e-mail"),
     name = forms.CharField(label=_("Name"), required=False,
         help_text=_("Optional name for public list of contributors"))
     email = forms.EmailField(label=_("Contact e-mail"),

-        help_text=_("We'll use it to contact you about your perks and fundraiser status and payment updates.<br/> "
-            "Won't be publicised."), required=False)
+        help_text=_("We'll use it to contact you about the <strong>details needed for your perks</strong>,<br/>"
+            "and to send you updates about your payment and the fundraiser status (which you can always turn off).<br/>"
+            "Your e-mail won't be publicised."), required=False)

 
     def __init__(self, offer, *args, **kwargs):
         self.offer = offer
 
     def __init__(self, offer, *args, **kwargs):
         self.offer = offer


@@ -23,10 +28,10 @@ class FundingForm(forms.Form):
         self.fields['amount'].widget.form_instance = self
 
     def clean_amount(self):
         self.fields['amount'].widget.form_instance = self
 
     def clean_amount(self):

-        if self.cleaned_data['amount'] < settings.FUNDING_MIN_AMOUNT:
-            min_amount = settings.FUNDING_MIN_AMOUNT
-            if isinstance(settings.FUNDING_MIN_AMOUNT, float):
-                min_amount = formats.number_format(settings.FUNDING_MIN_AMOUNT, 2)
+        if self.cleaned_data['amount'] < app_settings.MIN_AMOUNT:
+            min_amount = app_settings.MIN_AMOUNT
+            if isinstance(min_amount, float):
+                min_amount = formats.number_format(min_amount, 2)

             raise forms.ValidationError(
                 ugettext("The minimum amount is %(amount)s PLN.") % {
                     'amount': min_amount})
             raise forms.ValidationError(
                 ugettext("The minimum amount is %(amount)s PLN.") % {
                     'amount': min_amount})