Manually merge changes from #672 (thanks @koebi!)

This commit is contained in:
Raphael Michel
2017-11-04 11:29:02 +01:00
parent b94f307379
commit 1c7df4d9f7
5 changed files with 9 additions and 9 deletions

View File

@@ -18,7 +18,7 @@
{% if possible %}
<p>{% blocktrans %}Are you sure you want to delete the product <strong>{{ item }}</strong>?{% endblocktrans %}</p>
{% else %}
<p>{% blocktrans %}You cannot delete the product <strong>{{ item }}</strong> because it already has been ordered, but you can deactive it.{% endblocktrans %}</p>
<p>{% blocktrans %}You cannot delete the product <strong>{{ item }}</strong> because it already has been ordered, but you can deactivate it.{% endblocktrans %}</p>
{% endif %}
<div class="form-group submit-group">
<a href="{% url "control:event.items" organizer=request.event.organizer.slug event=request.event.slug %}" class="btn btn-default btn-cancel">