From 9b7822cca75d3fdd36f5a4cfa858272214621578 Mon Sep 17 00:00:00 2001 From: jordan Date: Wed, 6 Jul 2011 23:31:03 +0000 Subject: [PATCH] OSQA-436, now we support hyphens in the usernames too. Changing the username regex and the invalid username message in the registration form. git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1106 0cfe37f9-358a-4d5e-be75-b63607b5c754 --- forum/forms/general.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forum/forms/general.py b/forum/forms/general.py index e0348a8..aa4282e 100644 --- a/forum/forms/general.py +++ b/forum/forms/general.py @@ -36,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): @@ -49,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: -- 2.45.1