Commit f09d8642 authored by Michal Čihař's avatar Michal Čihař

Consistent messages for registration

parent 0d5c4af5
......@@ -250,7 +250,10 @@ class RegistrationForm(forms.Form):
)
if existing.exists():
raise forms.ValidationError(
_("A user with that username already exists.")
_(
'This username is already taken. '
'Please choose another.'
)
)
else:
return self.cleaned_data['username']
......@@ -302,7 +305,7 @@ class RegistrationForm(forms.Form):
if password1 != password2:
raise forms.ValidationError(
_("The two password fields didn't match.")
_('You must type the same password each time.')
)
except KeyError:
......
......@@ -3,18 +3,8 @@ Fake file to translate messages from Django
-->
<!--
These are from django-registration and django.contrib.auth.
These are from django core
-->
{% blocktrans %}This username is already taken. Please choose another.{% endblocktrans %}
{% blocktrans %}You must type the same password each time{% endblocktrans %}
{% blocktrans %}This email address is already in use. Please supply a different email address.{% endblocktrans %}
{% blocktrans %}Old password{% endblocktrans %}
{% blocktrans %}New password{% endblocktrans %}
{% blocktrans %}New password confirmation{% endblocktrans %}
{% blocktrans %}The two password fields didn't match.{% endblocktrans %}
{% blocktrans %}E-mail{% endblocktrans %}
{% blocktrans %}Username{% endblocktrans %}
{% blocktrans %}Password{% endblocktrans %}
{% blocktrans %}Hold down "Control", or "Command" on a Mac, to select more than one.{% endblocktrans %}
<!--
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment