Setting base template for password reset flow. Some translations.

This commit is contained in:
Víðir Valberg Guðmundsson 2021-03-04 09:09:11 +01:00
parent 141019ed75
commit 16db4ee143
5 changed files with 56 additions and 40 deletions

View file

@ -7,8 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-02-28 23:54+0100\n" "POT-Creation-Date: 2021-03-04 09:06+0100\n"
"PO-Revision-Date: 2021-02-28 23:44+0100\n" "PO-Revision-Date: 2021-03-04 09:06+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: da\n" "Language: da\n"
@ -79,11 +79,11 @@ msgstr ""
#: src/membership/models.py:45 #: src/membership/models.py:45
msgid "membership" msgid "membership"
msgstr "" msgstr "medlemskab"
#: src/membership/models.py:46 #: src/membership/models.py:46
msgid "memberships" msgid "memberships"
msgstr "" msgstr "medlemskaber"
#: src/membership/models.py:53 #: src/membership/models.py:53
msgid "subscription type" msgid "subscription type"
@ -103,11 +103,11 @@ msgstr ""
#: src/membership/models.py:73 #: src/membership/models.py:73
msgid "name" msgid "name"
msgstr "" msgstr "navn"
#: src/membership/templates/membership_overview.html:7 #: src/membership/templates/membership_overview.html:7
msgid "You do not have an active membership!" msgid "You do not have an active membership!"
msgstr "" msgstr "Du har ikke et aktivt medlemskab!"
#: src/membership/templates/membership_overview.html:9 #: src/membership/templates/membership_overview.html:9
msgid "" msgid ""
@ -116,7 +116,7 @@ msgstr ""
#: src/membership/templates/membership_overview.html:17 #: src/membership/templates/membership_overview.html:17
msgid "You are a member!" msgid "You are a member!"
msgstr "" msgstr "Du er medlem!"
#: src/membership/templates/membership_overview.html:19 #: src/membership/templates/membership_overview.html:19
msgid "Period" msgid "Period"
@ -126,13 +126,13 @@ msgstr "Periode"
msgid "Type" msgid "Type"
msgstr "Type" msgstr "Type"
#: src/project/settings.py:118 #: src/project/settings.py:131
msgid "Danish" msgid "Danish"
msgstr "" msgstr "Dansk"
#: src/project/settings.py:119 #: src/project/settings.py:132
msgid "English" msgid "English"
msgstr "" msgstr "Engelsk"
#: src/project/templates/account/account_inactive.html:5 #: src/project/templates/account/account_inactive.html:5
#: src/project/templates/account/account_inactive.html:8 #: 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 " "It can be safely ignored if you did not request a password reset. Click the "
"link below to reset your password." "link below to reset your password."
msgstr "" 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 #: src/project/templates/account/email/password_reset_key_message.txt:9
#, python-format #, python-format
@ -225,7 +229,7 @@ msgstr ""
#: src/project/templates/account/email/password_reset_key_subject.txt:3 #: src/project/templates/account/email/password_reset_key_subject.txt:3
msgid "Password Reset E-mail" 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:6
#: src/project/templates/account/email_confirm.html:10 #: src/project/templates/account/email_confirm.html:10
@ -250,28 +254,34 @@ msgid ""
"\"%(email_url)s\">issue a new e-mail confirmation request</a>." "\"%(email_url)s\">issue a new e-mail confirmation request</a>."
msgstr "" msgstr ""
#: src/project/templates/account/login.html:22 #: src/project/templates/account/login.html:20
#: src/project/templates/account/login.html:28 #: src/project/templates/account/login.html:26
msgid "Username/e-mail" #: src/project/templates/account/signup.html:26
msgstr "" #: 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:31
#: src/project/templates/account/login.html:39 #: src/project/templates/account/login.html:37
#: src/project/templates/account/signup.html:44 #: src/project/templates/account/signup.html:44
#: src/project/templates/account/signup.html:50 #: src/project/templates/account/signup.html:50
msgid "Password" msgid "Password"
msgstr "Kodeord" msgstr "Kodeord"
#: src/project/templates/account/login.html:43 #: src/project/templates/account/login.html:41
msgid "Sign in" msgid "Sign in"
msgstr "Log ind" 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" msgid "Or"
msgstr "Eller" msgstr "Eller"
#: src/project/templates/account/login.html:51 #: src/project/templates/account/login.html:53
#: src/project/templates/account/signup.html:8 #: src/project/templates/account/signup.html:6
msgid "Become a member" msgid "Become a member"
msgstr "Bliv medlem" msgstr "Bliv medlem"
@ -351,20 +361,30 @@ msgstr "Glemt kodeord?"
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
#: src/project/templates/account/password_reset.html:15 #: src/project/templates/account/password_reset.html:16
msgid "" msgid ""
"Forgotten your password? Enter your e-mail address below, and we'll send you " "Forgotten your password? Enter your e-mail address below, and we'll send you "
"an e-mail allowing you to reset it." "an e-mail allowing you to reset it."
msgstr "" 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" msgid "Reset My Password"
msgstr "" 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." msgid "Please contact us if you have any trouble resetting your password."
msgstr "" 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 #: src/project/templates/account/password_reset_done.html:15
msgid "" msgid ""
"We have sent you an e-mail. Please contact us if you do not receive it " "We have sent you an e-mail. Please contact us if you do not receive it "
@ -398,19 +418,14 @@ msgstr ""
msgid "Set Password" msgid "Set Password"
msgstr "Sæt kodeord" msgstr "Sæt kodeord"
#: src/project/templates/account/signup.html:26 #: src/project/templates/account/signup.html:19
#: src/project/templates/account/signup.html:32 msgid "To become a member, you need to have an account. Create one here."
msgid "E-mail" msgstr ""
msgstr "E-mail"
#: src/project/templates/account/signup.html:66 #: src/project/templates/account/signup.html:66
msgid "Sign up" msgid "Sign up"
msgstr "Bliv medlem" 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:5
#: src/project/templates/account/signup_closed.html:8 #: src/project/templates/account/signup_closed.html:8
msgid "Sign Up Closed" msgid "Sign Up Closed"

View file

@ -23,7 +23,7 @@
id="id_username" id="id_username"
name="login" name="login"
class="form-control mb-lg-2" class="form-control mb-lg-2"
placeholder="{% trans "Username/e-mail" %}" placeholder="{% trans "E-mail" %}"
required required
autofocus> autofocus>

View file

@ -1,11 +1,11 @@
{% extends "account/base.html" %} {% extends "account/pre_login_base.html" %}
{% load i18n %} {% load i18n %}
{% load account %} {% load account %}
{% block head_title %}{% trans "Password Reset" %}{% endblock %} {% block head_title %}{% trans "Password Reset" %}{% endblock %}
{% block content %} {% block non_login_content %}
<h1>{% trans "Password Reset" %}</h1> <h1>{% trans "Password Reset" %}</h1>
{% if user.is_authenticated %} {% if user.is_authenticated %}

View file

@ -1,9 +1,10 @@
{% extends "account/base.html" %} {% extends "account/pre_login_base.html" %}
{% load i18n %} {% load i18n %}
{% block head_title %}{% trans "Change Password" %}{% endblock %} {% 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> <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
{% if token_fail %} {% if token_fail %}

View file

@ -1,9 +1,9 @@
{% extends "account/base.html" %} {% extends "account/pre_login_base.html" %}
{% load i18n %} {% load i18n %}
{% block head_title %}{% trans "Change Password" %}{% endblock %} {% block head_title %}{% trans "Change Password" %}{% endblock %}
{% block content %} {% block non_login_content %}
<h1>{% trans "Change Password" %}</h1> <h1>{% trans "Change Password" %}</h1>
<p>{% trans 'Your password is now changed.' %}</p> <p>{% trans 'Your password is now changed.' %}</p>
{% endblock %} {% endblock %}