Commit a9093dd3 authored by Ramiro Morales's avatar Ramiro Morales
Browse files

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

parent 87908b4f

django/contrib/auth/models.py

+2 −2
Original line number Diff line number Diff line
@@ -358,8 +358,8 @@ class AbstractUser(AbstractBaseUser, PermissionsMixin): 
    Username, password and email are required. Other fields are optional.

    """

    username = models.CharField(_('username'), max_length=30, unique=True,

        help_text=_('Required. 30 characters or fewer. Letters, numbers and '

                    '@/./+/-/_ characters'),

        help_text=_('Required. 30 characters or fewer. Letters, digits and '

                    '@/./+/-/_ only.'),

        validators=[

            validators.RegexValidator(r'^[\w.@+-]+$', _('Enter a valid username.'), 'invalid')

        ])