Mentions légales du service

Skip to content
Snippets Groups Projects

Features/password links

Merged Robin Tissot requested to merge features/passwordLinks into develop

Merge request reports

Merged by Robin TissotRobin Tissot 5 years ago (Jun 2, 2020 11:02am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
7 {% block body %}
8 <div class="container">
9 <div class="row">
10 <div class="col-md-4 col-md-offset-4">
11 <div class="login-panel panel panel-default">
12 <div class="panel-heading">
13 <h3 class="panel-title">Please Sign In</h3>
14 </div>
15 <div class="panel-body">
16
17 <form method="post">
18 {% csrf_token %}
19
20 {% if form.errors %}
21 <p class="errornote">
22 {% if form.errors.items|length == 1 %}{% trans "Please correct the error below." %}{% else %}{% trans "Please correct the errors below." %}{% endif %}
  • Author Maintainer

    blocktrans has a plural keyword which is usually preferred, if no reasonable single formulation can be found.

  • Ok I've used the plural keyword. Just spotted that the dev version of the django docs prefers blocktranslate rather than blocktrans, but for our version of django we need to stick with blocktrans.

    I have created a new commit.

  • Please register or sign in to reply
  • Robin Tissot
    Robin Tissot @rtissot started a thread on commit 444e7525
  • 23 </p>
    24 {% endif %}
    25
    26 <p>{% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}</p>
    27
    28 <fieldset>
    29
    30 <div class="form-group">
    31 {{ form.old_password.errors }}
    32 {{ form.old_password.label_tag }} {{ form.old_password }}
    33 </div>
    34
    35 <div class="form-group">
    36 {{ form.new_password1.errors }}
    37 {{ form.new_password1.label_tag }} {{ form.new_password1 }}
    38 {% if form.new_password1.help_text %}
  • Robin Tissot added 499 commits

    added 499 commits

    Compare with previous version

  • Robin Tissot added 1 commit

    added 1 commit

    Compare with previous version

  • merged

  • Robin Tissot mentioned in commit fb2144a1

    mentioned in commit fb2144a1

  • mentioned in issue #8 (closed)

  • Please register or sign in to reply
    Loading