Download as
Browse Code »

Commit ea9742ad73d97e16029d858aeae05f7284275787

Authored by Alexandre Barbosa
1 parent 870e1511
Exists in spb-release/3.0 and in 2 other branches fix_cache_count_spb, layout-fix

Small correction: added _. 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: Carolina Ramalho <carol15022@hotmail.com>
Showing 3 changed files with 9 additions and 7 deletions   Show diff stats
colab/accounts/forms.py
  Diff comments   View file @ea9742a
@@ -198,10 +198,10 @@ class UserCreationForm(UserForm): @@ -198,10 +198,10 @@ class UserCreationForm(UserForm):
198 username = forms.RegexField(label=_("Username"), max_length=30, 198 username = forms.RegexField(label=_("Username"), max_length=30,
199 regex=r'^[\w.@+-]+$', 199 regex=r'^[\w.@+-]+$',
200 help_text=_(("Required. 30 characters or fewer" 200 help_text=_(("Required. 30 characters or fewer"
201 - ". Letter and digits.")), 201 + ". Letter, digits and _")),
202 error_messages={ 202 error_messages={
203 'invalid': _(("This value may contain only" 203 'invalid': _(("This value may contain only"
204 - " letters and numbers."))}) 204 + ". Letters, digits and _"))})
205 password1 = forms.CharField(label=_("Password"), 205 password1 = forms.CharField(label=_("Password"),
206 widget=forms.PasswordInput) 206 widget=forms.PasswordInput)
207 password2 = forms.CharField(label=_("Password confirmation"), 207 password2 = forms.CharField(label=_("Password confirmation"),
@@ -251,9 +251,11 @@ class UserCreationForm(UserForm): @@ -251,9 +251,11 @@ class UserCreationForm(UserForm):
251 class UserChangeForm(forms.ModelForm): 251 class UserChangeForm(forms.ModelForm):
252 username = forms.RegexField( 252 username = forms.RegexField(
253 label=_("Username"), max_length=30, regex=r"^[\w*]", 253 label=_("Username"), max_length=30, regex=r"^[\w*]",
254 - help_text=_("Required. 30 characters or fewer. Letters and digits."), 254 + help_text=_("Required. 30 characters or fewer. Letters, digits and _."
  255 + ),
255 error_messages={ 256 error_messages={
256 - 'invalid': _("This value may contain only letters and numbers.")}) 257 + 'invalid': _("This value may contain only letters, numbers and _.")
  258 + })
257 password = ReadOnlyPasswordHashField(label=_("Password"), 259 password = ReadOnlyPasswordHashField(label=_("Password"),
258 help_text=_("Raw passwords are not" 260 help_text=_("Raw passwords are not"
259 " stored, so there is no" 261 " stored, so there is no"
colab/accounts/models.py
  Diff comments   View file @ea9742a
@@ -82,7 +82,7 @@ class User(AbstractUser): @@ -82,7 +82,7 @@ class User(AbstractUser):
82 # without having to rewrite all AbstractUser here 82 # without having to rewrite all AbstractUser here
83 User._meta.get_field('email')._unique = True 83 User._meta.get_field('email')._unique = True
84 User._meta.get_field('username').help_text = _( 84 User._meta.get_field('username').help_text = _(
85 - u'Required. 30 characters or fewer. Letters and digits.' 85 + u'Required. 30 characters or fewer. Letters, digits and _.'
86 ) 86 )
87 User._meta.get_field('username').validators[0] = validators.RegexValidator( 87 User._meta.get_field('username').validators[0] = validators.RegexValidator(
88 r'^\w+$', 88 r'^\w+$',
colab/locale/pt_BR/LC_MESSAGES/django.po
  Diff comments   View file @ea9742a
@@ -1283,8 +1283,8 @@ msgstr &quot;&quot; @@ -1283,8 +1283,8 @@ msgstr &quot;&quot;
1283 1283
1284 1284
1285 #: colab/accounts/forms.py:276 1285 #: colab/accounts/forms.py:276
1286 -msgid "This value may contain only letters and numbers."  
1287 -msgstr "Esse campo só pode conter letras e/ou numeros." 1286 +msgid "This value may contain only letters, numbers and _."
  1287 +msgstr "Esse campo só pode conter letras, numeros e _."
1288 1288
1289 #~ msgid "Please correct the errors below and try again" 1289 #~ msgid "Please correct the errors below and try again"
1290 #~ msgstr "Por favor, corrija os erros abaixo e tente novamente" 1290 #~ msgstr "Por favor, corrija os erros abaixo e tente novamente"