X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/c5bc10247ac31142957ebf9d688993a582635985..ca88510e4dd14206f623cababfda1e8a9daf70d4:/forum/forms.py

diff --git a/forum/forms.py b/forum/forms.py
index c644b04..b54d65b 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -50,34 +50,32 @@ class TagNamesField(forms.CharField):
         self.max_length = 255
         self.label  = _('tags')
         #self.help_text = _('please use space to separate tags (this enables autocomplete feature)')
-        self.help_text = _('Tags are short keywords, with no spaces within. At least one %(min)s and up to %(max)s tags can be used.') % {
-            'min': apnumber(settings.FORM_MIN_NUMBER_OF_TAGS), 'max': apnumber(settings.FORM_MAX_NUMBER_OF_TAGS)    
+        self.help_text = _('Tags are short keywords, with no spaces within. At least %(min)s and up to %(max)s tags can be used.') % {
+            'min': settings.FORM_MIN_NUMBER_OF_TAGS, 'max': settings.FORM_MAX_NUMBER_OF_TAGS    
         }
         self.initial = ''
 
     def clean(self, value):
         value = super(TagNamesField, self).clean(value)
         data = value.strip()
-        if len(data) < 1:
-            raise forms.ValidationError(_('tags are required'))
 
         split_re = re.compile(r'[ ,]+')
         list = split_re.split(data)
-        list_temp = []
+
         if len(list) > settings.FORM_MAX_NUMBER_OF_TAGS or len(list) < settings.FORM_MIN_NUMBER_OF_TAGS:
-            raise forms.ValidationError(_('please use betwen %(min)s and %(max)s tags') % {
-            'min': apnumber(settings.FORM_MIN_NUMBER_OF_TAGS), 'max': apnumber(settings.FORM_MAX_NUMBER_OF_TAGS)
-        })
+            raise forms.ValidationError(_('please use between %(min)s and %(max)s tags') % { 'min': settings.FORM_MIN_NUMBER_OF_TAGS, 'max': settings.FORM_MAX_NUMBER_OF_TAGS})
 
+        list_temp = []
         tagname_re = re.compile(r'[a-z0-9]+')
         for tag in list:
-            if len(tag) > 20:
-                raise forms.ValidationError(_('tags must be shorter than 20 characters'))
+            if len(tag) > settings.FORM_MAX_LENGTH_OF_TAG or len(tag) < settings.FORM_MIN_LENGTH_OF_TAG:
+                raise forms.ValidationError(_('please use between %(min)s and %(max)s characters in you tags') % { 'min': settings.FORM_MIN_LENGTH_OF_TAG, 'max': settings.FORM_MAX_LENGTH_OF_TAG})
             if not tagname_re.match(tag):
                 raise forms.ValidationError(_('please use following characters in tags: letters \'a-z\', numbers, and characters \'.-_#\''))
             # only keep one same tag
             if tag not in list_temp and len(tag.strip()) > 0:
                 list_temp.append(tag)
+
         return u' '.join(list_temp)
 
 class WikiField(forms.BooleanField):
@@ -253,3 +251,7 @@ class SubscriptionSettingsForm(forms.Form):
     notify_comments = forms.BooleanField(required=False, initial=False)
     notify_accepted = forms.BooleanField(required=False, initial=False)
 
+
+class AwardPointsForm(forms.Form):
+    points = forms.IntegerField(min_value=1, initial=50, label=_('Points to award'))
+    message = forms.CharField(widget=forms.Textarea(), label=_('Message'), required=False)