p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #13000 - Use a dictionary for the error messages definition in user creation and change form. Thanks for the patch, lgs. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2010-03-15 12:16:01 +00:00
parent a03f675876
commit 7989a78baf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/forms.py
View File

@ -13,7 +13,7 @@ class UserCreationForm(forms.ModelForm):
""" """
username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^[\w.@+-]+$', username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^[\w.@+-]+$',
help_text = _("Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."), help_text = _("Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."),
error_message = _("This value may contain only letters, numbers and @/./+/-/_ characters.")) error_messages = {'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput) password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput)
password2 = forms.CharField(label=_("Password confirmation"), widget=forms.PasswordInput, password2 = forms.CharField(label=_("Password confirmation"), widget=forms.PasswordInput,
help_text = _("Enter the same password as above, for verification.")) help_text = _("Enter the same password as above, for verification."))
@ -47,7 +47,7 @@ class UserCreationForm(forms.ModelForm):
class UserChangeForm(forms.ModelForm): class UserChangeForm(forms.ModelForm):
username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^[\w.@+-]+$', username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^[\w.@+-]+$',
help_text = _("Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."), help_text = _("Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."),
error_message = _("This value may contain only letters, numbers and @/./+/-/_ characters.")) error_messages = {'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
class Meta: class Meta:
model = User model = User