Commit 7989a78b authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #13000 - Use a dictionary for the error messages definition in user... 

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
parent a03f6758

django/contrib/auth/forms.py

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ class UserCreationForm(forms.ModelForm): 
    """

    username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^[\w.@+-]+$',

        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)

    password2 = forms.CharField(label=_("Password confirmation"), widget=forms.PasswordInput,

        help_text = _("Enter the same password as above, for verification."))
@@ -47,7 +47,7 @@ class UserCreationForm(forms.ModelForm): 
class UserChangeForm(forms.ModelForm):

    username = forms.RegexField(label=_("Username"), max_length=30, regex=r'^[\w.@+-]+$',

        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:

        model = User