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

Fixed #21387 -- Merge two very similar help texts.

This commit is contained in:
Ramiro Morales 2013-11-06 00:35:20 -03:00
parent 87908b4fc2
commit a9093dd376
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -358,8 +358,8 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin):
Username, password and email are required. Other fields are optional. Username, password and email are required. Other fields are optional.
""" """
username = models.CharField(_('username'), max_length=30, unique=True, username = models.CharField(_('username'), max_length=30, unique=True,
help_text=_('Required. 30 characters or fewer. Letters, numbers and ' help_text=_('Required. 30 characters or fewer. Letters, digits and '
'@/./+/-/_ characters'), '@/./+/-/_ only.'),
validators=[ validators=[
validators.RegexValidator(r'^[\w.@+-]+$', _('Enter a valid username.'), 'invalid') validators.RegexValidator(r'^[\w.@+-]+$', _('Enter a valid username.'), 'invalid')
]) ])