Merge branch 'master' into Kerl/use_django_custommail

This commit is contained in:
Martin Pépin 2017-01-13 01:02:01 +01:00
commit 993b8ae87b
968 changed files with 9176 additions and 79623 deletions

View file

@ -38,7 +38,10 @@
{% endfor %}
</tbody>
</table>
<span class="bda-prix">Total : {{ total }} demandes</span>
<span class="bda-prix">
Total&nbsp;: {{ total }} place{{ total|pluralize }} demandée{{ total|pluralize }}
sur {{ proposed }} place{{ proposed|pluralize }} proposée{{ proposed|pluralize }}
</span>
<script type="text/javascript"
src="{% static "js/jquery.min.js" %}"></script>
<script type="text/javascript"