diff --git a/registration_defaults/templates/registration/activate.html b/registration_defaults/templates/registration/activate.html index 4a869d1..4f3bdbe 100644 --- a/registration_defaults/templates/registration/activate.html +++ b/registration_defaults/templates/registration/activate.html @@ -1,8 +1,8 @@ {% extends "registration/registration_base.html" %} {% load i18n %} -{% url 'auth_login' as auth_login_url %} {% block title %}{% if account %}{% trans "Activation complete" %}{% else %}{% trans "Activation problem" %}{% endif %}{% endblock %} {% block content %} +{% url 'auth_login' as auth_login_url %} {% if account %} {% blocktrans %} Thanks {{ account }}, activation complete! diff --git a/registration_defaults/templates/registration/activation_complete.html b/registration_defaults/templates/registration/activation_complete.html index 77da5d1..c2ab8dd 100644 --- a/registration_defaults/templates/registration/activation_complete.html +++ b/registration_defaults/templates/registration/activation_complete.html @@ -1,8 +1,8 @@ {% extends "registration/registration_base.html" %} {% load i18n %} -{% url 'auth_login' as auth_login_url %} {% block title %}{% trans "Activation complete" %}{% endblock %} {% block content %} +{% url 'auth_login' as auth_login_url %} {% blocktrans %} Thanks, activation complete! You may now login using the username and password you set at registration. {% endblocktrans %} diff --git a/registration_defaults/templates/registration/login.html b/registration_defaults/templates/registration/login.html index 0bacc2d..2fd6edb 100644 --- a/registration_defaults/templates/registration/login.html +++ b/registration_defaults/templates/registration/login.html @@ -1,9 +1,9 @@ {% extends "registration/registration_base.html" %} {% load i18n %} -{% url 'auth_password_reset' as auth_pwd_reset_url %} -{% url 'registration_register' as register_url%} {% block title %}{% trans "Login" %}{% endblock %} {% block content %} +{% url 'auth_password_reset' as auth_pwd_reset_url %} +{% url 'registration_register' as register_url%} {% if form.errors %}

{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}