Merge branch 'Validation_colab_sprint_30' into 'master'

Validation colab sprint 30 See merge request !54

Merge branch 'Validation_colab_sprint_30' into 'master'
Validation colab sprint 30 See merge request !54
Alexandre Barbosa
2 parents 9e24daab 954b3abf
Showing 4 changed files with 11 additions and 11 deletions Show diff stats
colab/accounts/forms.py
colab/accounts/models.py
colab/locale/pt_BR/LC_MESSAGES/django.mo
colab/locale/pt_BR/LC_MESSAGES/django.po
@@ -203,12 +203,10 @@ class UserCreationForm(UserForm):
     username = forms.RegexField(label=_("Username"), max_length=30,
                                 regex=r'^[\w.@+-]+$',
                                 help_text=_(("Required. 30 characters or fewer"
-                                             ". Letters, digits and "
-                                             "@/./+/-/_ only.")),
+                                             ". Letter and digits.")),
                                 error_messages={
                                     'invalid': _(("This value may contain only"
-                                                  " letters, numbers and "
-                                                  "@/./+/-/_ characters."))})
+                                                  " letters and numbers."))})
     password1 = forms.CharField(label=_("Password"),
                                 widget=forms.PasswordInput)
     password2 = forms.CharField(label=_("Password confirmation"),
@@ -272,12 +270,10 @@ class UserCreationForm(UserForm):
 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."),
+        label=_("Username"), max_length=30, regex=r"^[\w*]",
+        help_text=_("Required. 30 characters or fewer. Letters and digits."),
         error_messages={
-            'invalid': _("This value may contain only letters, numbers and "
-                         "@/./+/-/_ characters.")})
+            'invalid': _("This value may contain only letters and numbers.")})
     password = ReadOnlyPasswordHashField(label=_("Password"),
                                          help_text=_("Raw passwords are not"
                                                      " stored, so there is no"
@@ -82,8 +82,7 @@ class User(AbstractUser):
 #   without having to rewrite all AbstractUser here
 User._meta.get_field('email')._unique = True
 User._meta.get_field('username').help_text = _(
-    u'Required. 30 characters or fewer. Letters, digits and '
-    u'./+/-/_ only.'
+    u'Required. 30 characters or fewer. Letters and digits.'
 )
 User._meta.get_field('username').validators[0] = validators.RegexValidator(
     r'^\w+$',
@@ -1281,6 +1281,11 @@ msgstr &quot;&quot;
 "Outro exemplo de uso com relacionamento. Usado para recuperar todos as "
 "mensagem de um dado usuário usando o campo username ou email"
+
+#: colab/accounts/forms.py:276
+msgid "This value may contain only letters and numbers."
+msgstr "Esse campo só pode conter letras e/ou numeros."
+
 #~ msgid "Please correct the errors below and try again"
 #~ msgstr "Por favor, corrija os erros abaixo e tente novamente"