From: hernani <hernani@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Mon, 17 May 2010 14:13:05 +0000 (+0000)
Subject: Fixing OSQA 112, and an error originated by the last checkin.
X-Git-Tag: live~840
X-Git-Url: https://git.openstreetmap.org./osqa.git/commitdiff_plain/c7fc7d72dd6ae45801009883d84fe12e09ef1754

Fixing OSQA 112, and an error originated by the last checkin.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@291 0cfe37f9-358a-4d5e-be75-b63607b5c754
---

diff --git a/forum/forms.py b/forum/forms.py
index 509c125..6e736b9 100644
--- a/forum/forms.py
+++ b/forum/forms.py
@@ -57,7 +57,7 @@ class TagNamesField(forms.CharField):
 
     def clean(self, value):
         value = super(TagNamesField, self).clean(value)
-        data = value.strip()
+        data = value.strip().lower()
 
         split_re = re.compile(r'[ ,]+')
         list = split_re.split(data)
@@ -66,7 +66,7 @@ class TagNamesField(forms.CharField):
             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]+')
+        tagname_re = re.compile(r'^[\w+\.-]$', re.UNICODE)
         for tag in list:
             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})
diff --git a/forum/templatetags/user_tags.py b/forum/templatetags/user_tags.py
index 27535f6..cd22f26 100644
--- a/forum/templatetags/user_tags.py
+++ b/forum/templatetags/user_tags.py
@@ -1,7 +1,6 @@
 from django import template
 from django.utils.translation import ugettext as _
 from django.utils.safestring import mark_safe
-from forum.forms import AwardPointsForm
 import logging
 
 register = template.Library()