reverting the changes made in commit #1097 for Jira OSQA-593, it resulted another...

[osqa.git] / forum / forms / general.py

diff --git a/forum/forms/general.py b/forum/forms/general.py
index 4b1133e0f0ce6e811ee688565534ef45951cc4b3..aa4282e9efa4714333a09d2eab4f2ad4d7d0d9fc 100644 (file)
--- a/forum/forms/general.py
+++ b/forum/forms/general.py
@@ -7,6 +7,7 @@ from django.http import str_to_unicode
 from forum.models import User
 from forum.modules import call_all_handlers
 import urllib
+import logging
 
 DEFAULT_NEXT = getattr(settings, 'APP_BASE_URL')
 def clean_next(next):
@@ -35,7 +36,7 @@ class NextUrlField(forms.CharField):
         return clean_next(value)
 
 login_form_widget_attrs = { 'class': 'required login' }
-username_re = re.compile(r'^[\w\s ]+$', re.UNICODE)
+username_re = re.compile(r'^[\-\w\s ]+$', re.UNICODE)
 
 class UserNameField(StrippedNonEmptyCharField):
     def __init__(self,db_model=User, db_field='username', must_exist=False,skip_clean=False,label=_('choose a username'),**kw):
@@ -48,7 +49,7 @@ class UserNameField(StrippedNonEmptyCharField):
                         'forbidden':_('sorry, this name is not allowed, please choose another'),
                         'missing':_('sorry, there is no user with this name'),
                         'multiple-taken':_('sorry, we have a serious error - user name is taken by several users'),
-                        'invalid':_('user name can only consist of letters, empty space and underscore'),
+                        'invalid':_('user name can only consist of letters, empty space, hyphens and underscore'),
                         'toshort':_('user name is to short, please use at least %d characters') % settings.MIN_USERNAME_LENGTH
                     }
         if 'error_messages' in kw:
@@ -156,7 +157,11 @@ class SetPasswordForm(forms.Form):
             return self.cleaned_data['password2']
 
 class SimpleCaptchaForm(forms.Form):
+    fields = {}
+
     def __init__(self, *args, **kwargs):
+        super(SimpleCaptchaForm, self).__init__(*args, **kwargs)
+
         spam_fields = call_all_handlers('create_anti_spam_field')
         if spam_fields:
             spam_fields = dict(spam_fields)
@@ -166,4 +171,3 @@ class SimpleCaptchaForm(forms.Form):
             self._anti_spam_fields = spam_fields.keys()
         else:
             self._anti_spam_fields = []
-