From e474618a4ce76085d4f121b689f10f575694d069 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 17 Jul 2019 07:46:29 +0200
Subject: [PATCH] Update copy, update urls

---
 .../templates/registration/set_password_complete.html    | 8 ++++----
 .../templates/registration/set_password_confirm.html     | 4 ++--
 .../core/templates/registration/set_password_done.html   | 4 ++--
 .../core/templates/registration/set_password_form.html   | 9 +++++----
 .../core/templates/registration/set_password_subject.txt | 2 +-
 server/core/urls.py                                      | 2 +-
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/server/core/templates/registration/set_password_complete.html b/server/core/templates/registration/set_password_complete.html
index dbe05a3d..8ba4a7ba 100644
--- a/server/core/templates/registration/set_password_complete.html
+++ b/server/core/templates/registration/set_password_complete.html
@@ -1,13 +1,13 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block title %}{% trans 'Passwort setzen abgeschlossen' %}{% endblock %}
+{% block title %}{% trans 'Du hast es geschafft' %}{% endblock %}
 
 {% block body %}
   <h1 class="logo">skillbox</h1>
-    <h2 class="reset-heading">{% trans 'Passwort setzen abgeschlossen' %}</h2>
-    <p>{% trans 'Dein Passwort wurde erfolgreich gesetzt. Du kannst dich nun auf der Loginseite anmelden.' %}</p>
-    <p><a href="{% url "login" %}">{% trans 'Einloggen' %}</a></p>
+    <h2 class="reset-heading">{% trans 'Du hast es geschafft' %}</h2>
+    <p>{% trans 'Dein Passwort wurde erfolgreich gespeichert. Du kannst dich nun anmelden.' %}</p>
+    <p><a href="{% url "login" %}">{% trans 'Jetzt anmelden' %}</a></p>
 
 </div>
 {% endblock %}
diff --git a/server/core/templates/registration/set_password_confirm.html b/server/core/templates/registration/set_password_confirm.html
index db2bf7f8..395607aa 100644
--- a/server/core/templates/registration/set_password_confirm.html
+++ b/server/core/templates/registration/set_password_confirm.html
@@ -6,7 +6,7 @@
 
 {% block body %}
   <h1 class="logo">skillbox</h1>
-  <h2 class="reset-heading">{% trans 'Setze dein Passwort' %}</h2>
+  <h2 class="reset-heading">{% trans 'Gib ein persönliche Passwort ein:' %}</h2>
 
         <form method="post" class="mt-1">
         {% csrf_token %}
@@ -18,6 +18,6 @@
             {{ form.new_password2.label_tag }}
             {{ form.new_password2 }}
         </div>
-        <button class="btn mt-1" type="submit" name="action">{% trans 'Passwort setzen' %}</button>
+        <button class="btn mt-1" type="submit" name="action">{% trans 'Passwort speichern' %}</button>
     </form>
 {% endblock %}
diff --git a/server/core/templates/registration/set_password_done.html b/server/core/templates/registration/set_password_done.html
index f79996de..b9955742 100644
--- a/server/core/templates/registration/set_password_done.html
+++ b/server/core/templates/registration/set_password_done.html
@@ -2,11 +2,11 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block title %}{% trans 'Anweisungen versandt' %}{% endblock %}
+{% block title %}{% trans 'Schau in dein Postfach' %}{% endblock %}
 
 {% block body %}
   <h1 class="logo">skillbox</h1>
     <h2 class="reset-heading">{% trans 'Schau in dein Postfach' %}</h2>
-    <p>{% trans 'Wir haben die Anweisungen um dein Passwort zu setzen, an dich verschickt. Das E-Mail sollte in Kürze bei dir ankommen.' %}</p>
+    <p>{% trans 'Wir haben ein E-Mail mit allen weiteren Anweisungen an dich verschickt. Das E-Mail sollte in Kürze bei dir ankommen.' %}</p>
 </div>
 {% endblock %}
diff --git a/server/core/templates/registration/set_password_form.html b/server/core/templates/registration/set_password_form.html
index 844feb6b..f7b8000d 100644
--- a/server/core/templates/registration/set_password_form.html
+++ b/server/core/templates/registration/set_password_form.html
@@ -2,12 +2,13 @@
 {% extends 'base.html' %}
 {% load i18n %}
 
-{% block title %}{% trans 'Setze ein Passort' %}{% endblock %}
+{% block title %}{% trans 'Willkommen bei Myskillbox' %}{% endblock %}
 
 {% block body %}
   <h1 class="logo">skillbox</h1>
-    <h2 class="reset-heading">{% trans 'Setze ein Passort' %}</h2>
-    <p>{% trans 'Gib deine E-Mail ein und erhalte weitere Anweisungen um dein Passwort initial zu setzen.' %}</p>
+    <h2 class="reset-heading">{% trans 'Willkommen bei Myskillbox' %}</h2>
+    <p>{% trans 'Bevor du Myskillbox verwenden kannst, muss du deine E-Mail bestätigen und ein persönliches Passwort festlegen.' %}</p>
+    <p>{% trans 'Gib als erstes hier dein E-Mail ein:' %}</p>
 
         <form method="post" class="mt-1">
         {% csrf_token %}
@@ -16,7 +17,7 @@
             {{ form.email.label_tag }}
             {{ form.email }}
         </div>
-        <button class="btn mt-1" type="submit" name="action">{% trans 'Passwort setzen' %}</button>
+        <button class="btn mt-1" type="submit" name="action">{% trans 'E-Mail bestätigen' %}</button>
         <input type="hidden" name="next" value="{{ next }}"/>
     </form>
 
diff --git a/server/core/templates/registration/set_password_subject.txt b/server/core/templates/registration/set_password_subject.txt
index 148cd553..94018095 100644
--- a/server/core/templates/registration/set_password_subject.txt
+++ b/server/core/templates/registration/set_password_subject.txt
@@ -1 +1 @@
-myskillbox Passwort setzen
+Myskillbox: E-Mail bestätigen und Passwort setzen
diff --git a/server/core/urls.py b/server/core/urls.py
index 92717cbf..7a97c9cc 100644
--- a/server/core/urls.py
+++ b/server/core/urls.py
@@ -17,7 +17,7 @@ urlpatterns = [
     url(r'^statistics/', include('statistics.urls', namespace='statistics')),
 
     # set password
-    path('set-password/', SetPasswordView.as_view(), name='set_password'),
+    path('welcome/', SetPasswordView.as_view(), name='set_password'),
     path('set-password/done/', SetPasswordDoneView.as_view(), name='set_password_done'),
     path('set-password/<uidb64>/<token>/', SetPasswordConfirmView.as_view(), name='set_password_confirm'),
     path('set-password/done/', SetPasswordCompleteView.as_view(), name='set_password_complete'),