fix bug with related tags and object display when tag spanned both books and pictures

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

diff --git a/apps/funding/forms.py b/apps/funding/forms.py
index 6eba517..64cceb6 100644 (file)
--- a/apps/funding/forms.py
+++ b/apps/funding/forms.py
@@ -1,7 +1,13 @@
+# -*- 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 import forms

-from django.utils.translation import ugettext_lazy as _, ugettext as __
+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 .models import Funding
 from .widgets import PerksAmountWidget

+from . import app_settings

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


@@ -10,13 +16,11 @@ class FundingForm(forms.Form):
     amount = forms.DecimalField(label=_("Amount"), decimal_places=2,
         widget=PerksAmountWidget())
     name = forms.CharField(label=_("Name"), required=False,
     amount = forms.DecimalField(label=_("Amount"), decimal_places=2,
         widget=PerksAmountWidget())
     name = forms.CharField(label=_("Name"), required=False,

-        help_text=_("Optional name for public list of contributors. <br/>"
-            "Leave empty if you prefer to remain anonymous. <br/>"
-            "If we need any data for your perks, we'll get to you by e-mail anyway."))
+        help_text=_("Optional name for public list of contributors"))

     email = forms.EmailField(label=_("Contact e-mail"),
     email = forms.EmailField(label=_("Contact e-mail"),

-        help_text=_("Won't be publicised. <br/>"
-            "We'll use it to contact you about your perks and fundraiser status and payment updates.<br/> "
-            "Leave empty if you prefer not to be contacted by us."), 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


@@ -24,20 +28,28 @@ 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'] <= 0:
-            raise forms.ValidationError(__("Enter positive amount."))
+        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})

         return self.cleaned_data['amount']
 
     def clean(self):
         if not self.offer.is_current():
         return self.cleaned_data['amount']
 
     def clean(self):
         if not self.offer.is_current():

-            raise forms.ValidationError(__("This offer is out of date."))
+            raise forms.ValidationError(ugettext("This offer is out of date."))

         return self.cleaned_data
 
     def save(self):
         return self.cleaned_data
 
     def save(self):

-        return Funding.objects.create(
+        funding = Funding.objects.create(

             offer=self.offer,
             name=self.cleaned_data['name'],
             email=self.cleaned_data['email'],
             amount=self.cleaned_data['amount'],
             offer=self.offer,
             name=self.cleaned_data['name'],
             email=self.cleaned_data['email'],
             amount=self.cleaned_data['amount'],

+            language_code = get_language(),

         )
         )

+        funding.perks = funding.offer.get_perks(funding.amount)
+        return funding