Merge branch 'fix_translation_strings_2' into 'master'

fix broken translation strings (part 2)

See merge request allianceauth/allianceauth!1176
This commit is contained in:
Ariel Rin 2020-03-04 23:00:08 +00:00
commit d670e33b6f
3 changed files with 6 additions and 7 deletions

View File

@ -1,5 +1,5 @@
{% load i18n %}{% autoescape off %}
{% blocktrans %}You're receiving this email because you requested a password reset for your
{% blocktrans trimmed %}You're receiving this email because you requested a password reset for your
user account.{% endblocktrans %}
{% trans "Please go to the following page and choose a new password:" %}

View File

@ -16,7 +16,7 @@
{% endif %}
</h1>
<h2>
{% blocktrans count links=n_fats %}
{% blocktrans count links=n_fats trimmed %}
{{ user }} has collected one link this month.
{% plural %}
{{ user }} has collected {{ links }} links this month.
@ -36,7 +36,7 @@
</table>
{% if created_fats %}
<h2>
{% blocktrans count links=n_created_fats %}
{% blocktrans count links=n_created_fats trimmed %}
{{ user }} has created one link this month.
{% plural %}
{{ user }} has created {{ links }} links this month.

View File

@ -90,10 +90,9 @@
<th class="text-center">{% trans "Ship Type" %}</th>
<th class="text-center">{% trans "Killboard Loss Amt" %}</th>
<th class="text-center">{% trans "SRP ISK Cost" %}
{% blocktrans %}<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="Click value to edit
Enter to save&next
ESC to cancel"
id="blah"></i></th>{% endblocktrans %}
<i class="glyphicon glyphicon-question-sign" rel="tooltip" title="{% blocktrans trimmed %}Click value to edit
Enter to save & next
ESC to cancel{% endblocktrans %}"id="blah"></i></th>
<th class="text-center">{% trans "Post Time" %}</th>
<th class="text-center">{% trans "Status" %}</th>
{% if perms.auth.srp_management %}