From 0c7bd466c709247d490c59f6a82590c18e8d1160 Mon Sep 17 00:00:00 2001 From: Christian Berg Date: Fri, 16 Sep 2016 19:17:39 +0200 Subject: [PATCH] =?UTF-8?q?Kleinigkeiten=20und=20Tippfehler=20in=20den=20T?= =?UTF-8?q?emplates=20f=C3=BCr=20die=20Registrierung=20ge=C3=A4ndert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/membership/locale/de/LC_MESSAGES/django.po | 2 +- .../membership/email/activation_email.txt | 2 +- .../templates/membership/register_form.html | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/membership/locale/de/LC_MESSAGES/django.po b/src/membership/locale/de/LC_MESSAGES/django.po index 89d9661..fed0f7e 100644 --- a/src/membership/locale/de/LC_MESSAGES/django.po +++ b/src/membership/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kasu.membership\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-09-16 18:07+0200\n" -"PO-Revision-Date: 2016-09-16 18:20+0200\n" +"PO-Revision-Date: 2016-09-16 19:06+0200\n" "Last-Translator: Christian Berg \n" "Language-Team: Kasu \n" "Language: de\n" diff --git a/src/membership/templates/membership/email/activation_email.txt b/src/membership/templates/membership/email/activation_email.txt index d2cc593..ca82096 100644 --- a/src/membership/templates/membership/email/activation_email.txt +++ b/src/membership/templates/membership/email/activation_email.txt @@ -1,5 +1,5 @@ {% load i18n %} -{% blocktrans %}Welcome {{user}},{% endblocktrans %}. +{% blocktrans %}Welcome {{user}},{% endblocktrans %} {% blocktrans %}We received an account request on {{site.domain}} for your email address. To activate your account please visit the following link:{% endblocktrans %} diff --git a/src/membership/templates/membership/register_form.html b/src/membership/templates/membership/register_form.html index 54938be..6d564e1 100644 --- a/src/membership/templates/membership/register_form.html +++ b/src/membership/templates/membership/register_form.html @@ -3,15 +3,19 @@ {% load url from future %} {% block title %}{% trans "Registration"%}{% endblock %} - -{% block teaser%}

{% trans "Registration"%}

{% endblock %} +{% block teaser%} +

{% trans "Registration"%}

+
+{% blocktrans %}After you've provided your account data, you'll receive + an email asking you to verify your email address. You have to click on the + link in this verification email to confirm your email address, otherwise + your can't login.{% endblocktrans %} +
+{% endblock %} {% block maincontent %}
{% csrf_token %} -

Form

- -

End Form

{% trans "name"%} {% get_fieldset "gender, first_name, last_name, username" from form as form1 %} @@ -31,10 +35,6 @@
-

{% blocktrans %}After you've provided your account data, you'll receive - an email asking you to verify your email address. You have to click on the - link in this verification email to confirm your email address, otherwise - your can't login.{% endblocktrans %}