Merge branch 'fix_translation_string_bugs' into 'master'

Fix translation string bugs

See merge request allianceauth/allianceauth!1175
This commit is contained in:
Ariel Rin 2020-03-03 00:52:18 +00:00
commit 9c880eae8a
3 changed files with 17 additions and 6 deletions

View File

@ -15,7 +15,13 @@
</div>
{% endif %}
</h1>
<h2>{% blocktrans %}{{ user }} has collected {{ n_fats }} link{{ n_fats|pluralize }} this month.{% endblocktrans %}</h2>
<h2>
{% blocktrans count links=n_fats %}
{{ user }} has collected one link this month.
{% plural %}
{{ user }} has collected {{ links }} links this month.
{% endblocktrans %}
</h2>
<table class="table table-responsive">
<tr>
<th class="col-md-2 text-center">{% trans "Ship" %}</th>
@ -29,7 +35,13 @@
{% endfor %}
</table>
{% if created_fats %}
<h2>{% blocktrans %}{{ user }} has created {{ n_created_fats }} link{{ n_created_fats|pluralize }} this month.{% endblocktrans %}</h2>
<h2>
{% blocktrans count links=n_created_fats %}
{{ user }} has created one link this month.
{% plural %}
{{ user }} has created {{ links }} links this month.
{% endblocktrans %}
</h2>
{% if created_fats %}
<table class="table">
<tr>

View File

@ -2,7 +2,6 @@
{% load i18n %}
{% block page_title %}
{% blocktrans with service_name=view.service_name|title %}Delete {{ service_name }} Account?{% endblocktrans %}
{% endblock page_title %}
@ -18,8 +17,8 @@
<form action="" method="post">
{% csrf_token %}
<p>
{% blocktrans trimmed %}
Are you sure you want to delete your {{ view.service_name }} account {{ object }}?
{% blocktrans trimmed with service_name=view.service_name|title %}
Are you sure you want to delete your {{ service_name }} account {{ object }}?
{% endblocktrans %}
</p>
<input class="btn btn-danger btn-block" type="submit" value="Confirm" />

View File

@ -89,7 +89,7 @@
{% if task_queue_length < 0 %}
{% trans "Error retrieving task queue length" %}
{% else %}
{% blocktrans count tasks=task_queue_length %}
{% blocktrans trimmed count tasks=task_queue_length %}
{{ tasks }} task
{% plural %}
{{ tasks }} tasks