Translation support and minor login view changes #35

Open
rskthomas wants to merge 20 commits from feature/translation into main
2 changed files with 25 additions and 26 deletions
Showing only changes of commit a2e29edee0 - Show all commits

View file

@ -2,26 +2,23 @@
{% load i18n django_bootstrap5 %}
{% block login_content %}
<div class="well">
<div class="row-fluid">
<h2>{% trans 'Password reset' %}</h2>
<span>{% trans "Forgotten your password? Enter your email address below, and we'll email instructions for setting a new one." %}</span>
</div>
<div class="card-body">
<div class="pt-2 pb-3">
<h4 class="card-title text-center pb-2 help"> {% trans "Password Reset" %}</h5>
</div>
<p class="text-center text-muted fs-6">{% trans "Enter your email address below, and we'll email instructions for setting a new one." %}</p>
<form action="{% url 'login:password_reset' %}" method="post" class="mt-4">
{% csrf_token %}
{% bootstrap_form form layout='floating' %}
{% bootstrap_form_errors form type='non_fields' %}
<div class="d-grid gap-2">
<button type="submit" class="btn btn-primary">{% trans 'Reset' %}</button>
</div>
</form>
</div>
<div class="text-center mt-3">
<a href="{% url 'login:login' %}" class="btn btn-link text-secondary">{% trans 'Back to login' %}</a>
</div>
<div class="well">
<div class="row-fluid">
<div>
<form action="{% url 'login:password_reset' %}" role="form" method="post">
{% csrf_token %}
{% bootstrap_form form %}
{% bootstrap_form_errors form type='non_fields' %}
<div class="form-actions-no-box">
<input type="submit" name="submit" value="{% trans 'Reset my password' %}" class="btn btn-primary form-control" id="submit-id-submit">
</div>
</form>
</div>
</div><!-- /.row-fluid -->
</div><!--/.well-->
{% endblock %}

View file

@ -4,12 +4,14 @@
{% block login_content %}
<div class="well">
<div class="row-fluid">
<h2>{% trans 'Password reset sent' %}</h2>
<p>{% trans "We've emailed you instructions for setting your password, if an account exists with the email you entered. You should receive them shortly." %}</p>
<p>{% trans "If you don't receive an email, please make sure you've entered the address you registered with, and check your spam folder." %}</p>
<h4 class="card-title text-center text-bold">{% trans 'Password reset sent' %}</h4>
<p class="text-center text-muted mt-4 fs-7">{% trans "We've sent you an email with instructions to reset your password. If an account with the provided email exists, you should receive it shortly." %}</p>
<p class="text-center text-muted fs-7">{% trans "If you don't receive an email, please check the email address you entered and look in your spam folder." %}</p>
</div><!-- /.row-fluid -->
<div class="text-center mt-3">
<a href="{% url 'login:login' %}" class="btn btn-link text-primary">{% trans 'Back to login' %}</a>
</div>
</div><!--/.well-->
{% endblock %}