From 16db4ee14337927ca7097120457d7145d91cd9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Thu, 4 Mar 2021 09:09:11 +0100
Subject: [PATCH] Setting base template for password reset flow. Some
 translations.

---
 src/project/locale/da/LC_MESSAGES/django.po   | 81 +++++++++++--------
 src/project/templates/account/login.html      |  2 +-
 .../account/password_reset_done.html          |  4 +-
 .../account/password_reset_from_key.html      |  5 +-
 .../account/password_reset_from_key_done.html |  4 +-
 5 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/src/project/locale/da/LC_MESSAGES/django.po b/src/project/locale/da/LC_MESSAGES/django.po
index 3e1392b..9bb7b83 100644
--- a/src/project/locale/da/LC_MESSAGES/django.po
+++ b/src/project/locale/da/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-28 23:54+0100\n"
-"PO-Revision-Date: 2021-02-28 23:44+0100\n"
+"POT-Creation-Date: 2021-03-04 09:06+0100\n"
+"PO-Revision-Date: 2021-03-04 09:06+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: da\n"
@@ -79,11 +79,11 @@ msgstr ""
 
 #: src/membership/models.py:45
 msgid "membership"
-msgstr ""
+msgstr "medlemskab"
 
 #: src/membership/models.py:46
 msgid "memberships"
-msgstr ""
+msgstr "medlemskaber"
 
 #: src/membership/models.py:53
 msgid "subscription type"
@@ -103,11 +103,11 @@ msgstr ""
 
 #: src/membership/models.py:73
 msgid "name"
-msgstr ""
+msgstr "navn"
 
 #: src/membership/templates/membership_overview.html:7
 msgid "You do not have an active membership!"
-msgstr ""
+msgstr "Du har ikke et aktivt medlemskab!"
 
 #: src/membership/templates/membership_overview.html:9
 msgid ""
@@ -116,7 +116,7 @@ msgstr ""
 
 #: src/membership/templates/membership_overview.html:17
 msgid "You are a member!"
-msgstr ""
+msgstr "Du er medlem!"
 
 #: src/membership/templates/membership_overview.html:19
 msgid "Period"
@@ -126,13 +126,13 @@ msgstr "Periode"
 msgid "Type"
 msgstr "Type"
 
-#: src/project/settings.py:118
+#: src/project/settings.py:131
 msgid "Danish"
-msgstr ""
+msgstr "Dansk"
 
-#: src/project/settings.py:119
+#: src/project/settings.py:132
 msgid "English"
-msgstr ""
+msgstr "Engelsk"
 
 #: src/project/templates/account/account_inactive.html:5
 #: src/project/templates/account/account_inactive.html:8
@@ -217,6 +217,10 @@ msgid ""
 "It can be safely ignored if you did not request a password reset. Click the "
 "link below to reset your password."
 msgstr ""
+"Du modtager denne e-mail fordi du, eller nogen anden, har anmodet om "
+"nulstilling af dit kodeord.\n"
+"Du kan trygt ignorere dette hvis det ikke var dig der anmodede om "
+"nulstillingen. Klik på linket herunder for at nulstille dit kodeord."
 
 #: src/project/templates/account/email/password_reset_key_message.txt:9
 #, python-format
@@ -225,7 +229,7 @@ msgstr ""
 
 #: src/project/templates/account/email/password_reset_key_subject.txt:3
 msgid "Password Reset E-mail"
-msgstr ""
+msgstr "Nulstilling af password"
 
 #: src/project/templates/account/email_confirm.html:6
 #: src/project/templates/account/email_confirm.html:10
@@ -250,28 +254,34 @@ msgid ""
 "\"%(email_url)s\">issue a new e-mail confirmation request</a>."
 msgstr ""
 
-#: src/project/templates/account/login.html:22
-#: src/project/templates/account/login.html:28
-msgid "Username/e-mail"
-msgstr ""
+#: src/project/templates/account/login.html:20
+#: src/project/templates/account/login.html:26
+#: src/project/templates/account/signup.html:26
+#: src/project/templates/account/signup.html:32
+msgid "E-mail"
+msgstr "E-mail"
 
-#: src/project/templates/account/login.html:33
-#: src/project/templates/account/login.html:39
+#: src/project/templates/account/login.html:31
+#: src/project/templates/account/login.html:37
 #: src/project/templates/account/signup.html:44
 #: src/project/templates/account/signup.html:50
 msgid "Password"
 msgstr "Kodeord"
 
-#: src/project/templates/account/login.html:43
+#: src/project/templates/account/login.html:41
 msgid "Sign in"
 msgstr "Log ind"
 
-#: src/project/templates/account/login.html:46
+#: src/project/templates/account/login.html:45
+msgid "Forgot password?"
+msgstr "Glemt kodeord?"
+
+#: src/project/templates/account/login.html:48
 msgid "Or"
 msgstr "Eller"
 
-#: src/project/templates/account/login.html:51
-#: src/project/templates/account/signup.html:8
+#: src/project/templates/account/login.html:53
+#: src/project/templates/account/signup.html:6
 msgid "Become a member"
 msgstr "Bliv medlem"
 
@@ -351,20 +361,30 @@ msgstr "Glemt kodeord?"
 msgid "Password Reset"
 msgstr ""
 
-#: src/project/templates/account/password_reset.html:15
+#: src/project/templates/account/password_reset.html:16
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll send you "
 "an e-mail allowing you to reset it."
 msgstr ""
 
-#: src/project/templates/account/password_reset.html:20
+#: src/project/templates/account/password_reset.html:21
+#: src/project/templates/account/password_reset.html:27
+msgid "E-mail address"
+msgstr "E-mail adresser"
+
+#: src/project/templates/account/password_reset.html:38
 msgid "Reset My Password"
 msgstr ""
 
-#: src/project/templates/account/password_reset.html:23
+#: src/project/templates/account/password_reset.html:41
 msgid "Please contact us if you have any trouble resetting your password."
 msgstr ""
 
+#: src/project/templates/account/password_reset.html:47
+#: src/project/templates/account/signup.html:72
+msgid "To login"
+msgstr "Til login"
+
 #: src/project/templates/account/password_reset_done.html:15
 msgid ""
 "We have sent you an e-mail. Please contact us if you do not receive it "
@@ -398,19 +418,14 @@ msgstr ""
 msgid "Set Password"
 msgstr "Sæt kodeord"
 
-#: src/project/templates/account/signup.html:26
-#: src/project/templates/account/signup.html:32
-msgid "E-mail"
-msgstr "E-mail"
+#: src/project/templates/account/signup.html:19
+msgid "To become a member, you need to have an account. Create one here."
+msgstr ""
 
 #: src/project/templates/account/signup.html:66
 msgid "Sign up"
 msgstr "Bliv medlem"
 
-#: src/project/templates/account/signup.html:72
-msgid "To login"
-msgstr "Til login"
-
 #: src/project/templates/account/signup_closed.html:5
 #: src/project/templates/account/signup_closed.html:8
 msgid "Sign Up Closed"
diff --git a/src/project/templates/account/login.html b/src/project/templates/account/login.html
index 0c36f83..d4b29cb 100644
--- a/src/project/templates/account/login.html
+++ b/src/project/templates/account/login.html
@@ -23,7 +23,7 @@
                id="id_username"
                name="login"
                class="form-control mb-lg-2"
-               placeholder="{% trans "Username/e-mail" %}"
+               placeholder="{% trans "E-mail" %}"
                required
                autofocus>
 
diff --git a/src/project/templates/account/password_reset_done.html b/src/project/templates/account/password_reset_done.html
index df7faf9..6a9ac20 100644
--- a/src/project/templates/account/password_reset_done.html
+++ b/src/project/templates/account/password_reset_done.html
@@ -1,11 +1,11 @@
-{% extends "account/base.html" %}
+{% extends "account/pre_login_base.html" %}
 
 {% load i18n %}
 {% load account %}
 
 {% block head_title %}{% trans "Password Reset" %}{% endblock %}
 
-{% block content %}
+{% block non_login_content %}
     <h1>{% trans "Password Reset" %}</h1>
 
     {% if user.is_authenticated %}
diff --git a/src/project/templates/account/password_reset_from_key.html b/src/project/templates/account/password_reset_from_key.html
index 16f27e9..8eefa02 100644
--- a/src/project/templates/account/password_reset_from_key.html
+++ b/src/project/templates/account/password_reset_from_key.html
@@ -1,9 +1,10 @@
-{% extends "account/base.html" %}
+{% extends "account/pre_login_base.html" %}
 
 {% load i18n %}
+
 {% block head_title %}{% trans "Change Password" %}{% endblock %}
 
-{% block content %}
+{% block non_login_content %}
     <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
 
     {% if token_fail %}
diff --git a/src/project/templates/account/password_reset_from_key_done.html b/src/project/templates/account/password_reset_from_key_done.html
index 85641c2..50102a4 100644
--- a/src/project/templates/account/password_reset_from_key_done.html
+++ b/src/project/templates/account/password_reset_from_key_done.html
@@ -1,9 +1,9 @@
-{% extends "account/base.html" %}
+{% extends "account/pre_login_base.html" %}
 
 {% load i18n %}
 {% block head_title %}{% trans "Change Password" %}{% endblock %}
 
-{% block content %}
+{% block non_login_content %}
     <h1>{% trans "Change Password" %}</h1>
     <p>{% trans 'Your password is now changed.' %}</p>
 {% endblock %}