diff --git a/hypha/apply/users/templates/two_factor/core/backup_tokens.html b/hypha/apply/users/templates/two_factor/core/backup_tokens.html
index 545536d013ac470484795682e14052375e5459f2..444074d392acaaedfb8201ad57ab830b24726001 100644
--- a/hypha/apply/users/templates/two_factor/core/backup_tokens.html
+++ b/hypha/apply/users/templates/two_factor/core/backup_tokens.html
@@ -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
diff --git a/hypha/apply/users/templates/two_factor/core/backup_tokens_password.html b/hypha/apply/users/templates/two_factor/core/backup_tokens_password.html
index 12d3028ce8dd5b8eb80d770df74aaf515de911f0..1092b3f7d404906ecad0962fecaa4887e09b92b0 100644
--- a/hypha/apply/users/templates/two_factor/core/backup_tokens_password.html
+++ b/hypha/apply/users/templates/two_factor/core/backup_tokens_password.html
@@ -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>
diff --git a/hypha/apply/users/templates/two_factor/profile/disable.html b/hypha/apply/users/templates/two_factor/profile/disable.html
index aa47f1654bba4fa68464f28177aaabc8dc931fc7..811098ae115fc7436ec0508642e291afae80e096 100644
--- a/hypha/apply/users/templates/two_factor/profile/disable.html
+++ b/hypha/apply/users/templates/two_factor/profile/disable.html
@@ -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>
diff --git a/hypha/apply/users/templates/two_factor/profile/profile.html b/hypha/apply/users/templates/two_factor/profile/profile.html
index 1ffe8dd38c0fd69f11c498357e756afdcb63e4ea..b419947de0d3e6cb0da529a2cebd4bf590e97709 100644
--- a/hypha/apply/users/templates/two_factor/profile/profile.html
+++ b/hypha/apply/users/templates/two_factor/profile/profile.html
@@ -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">
diff --git a/hypha/apply/users/templates/users/change_password.html b/hypha/apply/users/templates/users/change_password.html
index 5b66a7d424bf3dee3555cfcd7d2fac0f7606d5be..b671f6e256111aa50721550f002f0433c1f13ad2 100644
--- a/hypha/apply/users/templates/users/change_password.html
+++ b/hypha/apply/users/templates/users/change_password.html
@@ -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>
diff --git a/hypha/apply/users/templates/users/email_change/confirm_password.html b/hypha/apply/users/templates/users/email_change/confirm_password.html
index 73011a83d1a31c317907a9247d25a9229e759fd9..b2527aaa91a93ca17ccebbcee2818410a7695739 100644
--- a/hypha/apply/users/templates/users/email_change/confirm_password.html
+++ b/hypha/apply/users/templates/users/email_change/confirm_password.html
@@ -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>
diff --git a/hypha/apply/users/templates/users/login.html b/hypha/apply/users/templates/users/login.html
index c2a084a0c7624491c9e23a23bb93388190caa940..2468c63e8075207946dd5f04946eda84b93fcb60 100644
--- a/hypha/apply/users/templates/users/login.html
+++ b/hypha/apply/users/templates/users/login.html
@@ -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 %}
diff --git a/hypha/apply/users/templates/users/password_reset/confirm.html b/hypha/apply/users/templates/users/password_reset/confirm.html
index e5d2940b462cd4be52b918e5409c04ae61e4b288..076197a8d873e36ca4b5dac3885c848caa403e39 100644
--- a/hypha/apply/users/templates/users/password_reset/confirm.html
+++ b/hypha/apply/users/templates/users/password_reset/confirm.html
@@ -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>