Skip to content
Snippets Groups Projects
Commit ef1aa991 authored by Fredrik Jonsson's avatar Fredrik Jonsson
Browse files

Make use of trimmed attribute on blocktrans to remove extra whitespace.

parent 4b865bb0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 17 deletions
hypha/apply/users/templates/two_factor/core/backup_tokens.html
+ 1
− 1
View file @ ef1aa991
......@@ -5,7 +5,7 @@
<p><a href="{% url 'two_factor:profile'%}"
class="btn btn-link">{% trans "Back" %}</a></p>
<h1>{% block title %}{% trans "Backup Tokens" %}{% endblock %}</h1>
<p>{% blocktrans %}Backup tokens can be used when your primary and backup
<p>{% blocktrans trimmed %}Backup tokens can be used when your primary and backup
phone numbers aren't available. The backup tokens below can be used
for login verification. If you've used up all your backup tokens, you
can generate a new set of backup tokens. Only the backup tokens shown
......
hypha/apply/users/templates/two_factor/core/backup_tokens_password.html
+ 2
− 2
View file @ ef1aa991
......@@ -5,7 +5,7 @@
<p><a href="{% url 'two_factor:profile'%}"
class="btn btn-link">{% trans "Back to account" %}</a></p>
<h1>{% block title %}{% trans "Backup Tokens" %}{% endblock %}</h1>
<p>{% blocktrans %}Backup tokens can be used when your primary and backup
<p>{% blocktrans trimmed %}Backup tokens can be used when your primary and backup
phone numbers aren't available. The backup tokens below can be used
for login verification.
</br>
......@@ -24,7 +24,7 @@
{% if form.errors %}
<ul class="errorlist">
{% blocktrans count counter=form.errors.items|length %}
{% blocktrans trimmed count counter=form.errors.items|length %}
<li>Please correct the error below.</li>
{% plural %}
<li>Please correct the errors below.</li>
......
hypha/apply/users/templates/two_factor/profile/disable.html
+ 2
− 2
View file @ ef1aa991
......@@ -5,7 +5,7 @@
<p><a href="{% url 'two_factor:profile'%}"
class="btn btn-link">{% trans "Back to account" %}</a></p>
<h1>{% block title %}{% trans "Disable Two-factor Authentication" %}{% endblock %}</h1>
<p>{% blocktrans %}Disabling Two-factor authentication weakens your account security.
<p>{% blocktrans trimmed %}Disabling Two-factor authentication weakens your account security.
We recommend reenabling it when you can.{% endblocktrans %}</p>
<div class="wrapper wrapper--small wrapper--inner-space-medium">
<form class="form" action="" method="POST" novalidate>
......@@ -19,7 +19,7 @@
{% if form.errors %}
<ul class="errorlist">
{% blocktrans count counter=form.errors.items|length %}
{% blocktrans trimmed count counter=form.errors.items|length %}
<li>Please correct the error below.</li>
{% plural %}
<li>Please correct the errors below.</li>
......
hypha/apply/users/templates/two_factor/profile/profile.html
+ 5
− 5
View file @ ef1aa991
......@@ -19,7 +19,7 @@
{% if available_phone_methods %}
<h2>{% trans "Backup Phone Numbers" %}</h2>
<p>{% blocktrans %}If your primary method is not available, we are able to
<p>{% blocktrans trimmed %}If your primary method is not available, we are able to
send backup tokens to the phone numbers listed below.{% endblocktrans %}</p>
<ul>
{% for phone in backup_phones %}
......@@ -40,9 +40,9 @@
<h2>{% trans "Backup Tokens" %}</h2>
<p>
{% blocktrans %}If you don't have any device with you, you can access
{% blocktrans trimmed %}If you don't have any device with you, you can access
your account using backup tokens.{% endblocktrans %}
{% blocktrans count counter=backup_tokens %}
{% blocktrans trimmed count counter=backup_tokens %}
You have only one backup token remaining.
{% plural %}
You have {{ counter }} backup tokens remaining.
......@@ -52,12 +52,12 @@
class="btn btn-info">{% trans "Show Codes" %}</a></p>
<h2>{% trans "Disable Two-Factor Authentication" %}</h2>
<p>{% blocktrans %}However we strongly discourage you to do so, you can
<p>{% blocktrans trimmed %}However we strongly discourage you to do so, you can
also disable two-factor authentication for your account.{% endblocktrans %}</p>
<p><a class="btn btn-default" href="{% url 'two_factor:disable' %}">
{% trans "Disable Two-Factor Authentication" %}</a></p>
{% else %}
<p>{% blocktrans %}Two-factor authentication is not enabled for your
<p>{% blocktrans trimmed %}Two-factor authentication is not enabled for your
account. Enable two-factor authentication for enhanced account
security.{% endblocktrans %}</p>
<p><a href="{% url 'two_factor:setup' %}" class="btn btn-primary">
......
hypha/apply/users/templates/users/change_password.html
+ 1
− 1
View file @ ef1aa991
......@@ -17,7 +17,7 @@
{% if form.errors %}
<ul class="errorlist">
{% blocktrans count counter=form.errors.items|length %}
{% blocktrans trimmed count counter=form.errors.items|length %}
<li>Please correct the error below.</li>
{% plural %}
<li>Please correct the errors below.</li>
......
hypha/apply/users/templates/users/email_change/confirm_password.html
+ 1
− 1
View file @ ef1aa991
......@@ -18,7 +18,7 @@
{% if form.errors %}
<ul class="errorlist">
{% blocktrans count counter=form.errors.items|length %}
{% blocktrans trimmed count counter=form.errors.items|length %}
<li>Please correct the error below.</li>
{% plural %}
<li>Please correct the errors below.</li>
......
hypha/apply/users/templates/users/login.html
+ 4
− 4
View file @ ef1aa991
......@@ -11,17 +11,17 @@
<p>{% blocktrans %}Enter your credentials.{% endblocktrans %}</p>
{% elif wizard.steps.current == 'token' %}
{% if device.method == 'call' %}
<p>{% blocktrans %}We are calling your phone right now, please enter the
<p>{% blocktrans trimmed %}We are calling your phone right now, please enter the
digits you hear.{% endblocktrans %}</p>
{% elif device.method == 'sms' %}
<p>{% blocktrans %}We sent you a text message, please enter the tokens we
<p>{% blocktrans trimmed %}We sent you a text message, please enter the tokens we
sent.{% endblocktrans %}</p>
{% else %}
<p>{% blocktrans %}Please enter the tokens generated by your token
<p>{% blocktrans trimmed %}Please enter the tokens generated by your token
generator.{% endblocktrans %}</p>
{% endif %}
{% elif wizard.steps.current == 'backup' %}
<p>{% blocktrans %}Use this form for entering backup tokens for logging in.
<p>{% blocktrans trimmed %}Use this form for entering backup tokens for logging in.
These tokens have been generated for you to print and keep safe. Please
enter one of these backup tokens to login to your account.{% endblocktrans %}</p>
{% endif %}
......
hypha/apply/users/templates/users/password_reset/confirm.html
+ 1
− 1
View file @ ef1aa991
......@@ -17,7 +17,7 @@
{% if form.errors %}
<ul class="errorlist">
{% blocktrans count counter=form.errors.items|length %}
{% blocktrans trimmed count counter=form.errors.items|length %}
<li>Please correct the error below.</li>
{% plural %}
<li>Please correct the errors below.</li>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment