Add grammar to tags. Also: respect custom tag slugs on publishing.
[wolnelektury.git] / src / club / forms.py
index f919855..75213fc 100644 (file)
@@ -3,7 +3,7 @@
 #
 from decimal import Decimal
 from django import forms
 #
 from decimal import Decimal
 from django import forms
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from newsletter.forms import NewsletterForm
 from . import models, payment_methods
 from .payu.forms import CardTokenForm
 from newsletter.forms import NewsletterForm
 from . import models, payment_methods
 from .payu.forms import CardTokenForm
@@ -143,7 +143,7 @@ class DonationStep1Form(forms.ModelForm):
         state['amount'] = \
             self.cleaned_data[f'{which}_amount'] or \
             self.cleaned_data['custom_amount'] or \
         state['amount'] = \
             self.cleaned_data[f'{which}_amount'] or \
             self.cleaned_data['custom_amount'] or \
-            self.cleaned_data[f'{monthly}_amount_selected']
+            self.cleaned_data[f'{which}_amount_selected']
 
         return state
 
 
         return state