Correct english typos (#662)

* Check that vouchers selected via API are for the correct event

* Choose different subject for reminder mails if auto-expiry is off

* correct english typos

As with PR #660, it should be checked whether the changes to the
.po-files are respected in the corresponding src-files.
This commit is contained in:
Jakob Schnell
2017-11-03 11:40:52 +01:00
committed by Raphael Michel
parent 1285e9aa69
commit 4614d04be4
12 changed files with 53 additions and 22 deletions

View File

@@ -4,7 +4,7 @@
{% url "control:event.order" organizer=event.organizer.slug event=event.slug code=data.order as ourl %}
{% blocktrans trimmed with payment=data.payment order="<a href='"|add:ourl|add:"'>"|add:data.order|add:"</a>"|safe %}
The PayPal transaction {{ payment }} has succeeded, but the order {{ order }} is expired and the product
was sold out in the meantime. Therefore, the payment could not be acceped. Please contact the user and refund
was sold out in the meantime. Therefore, the payment could not be accepted. Please contact the user and refund
the money via PayPal's interface.
{% endblocktrans %}
</p>

View File

@@ -1,6 +1,6 @@
{% load i18n %}
<p>{% blocktrans trimmed %}
The total amount listed above will be withdrawn from your PayPal acocunt after the
The total amount listed above will be withdrawn from your PayPal account after the
confirmation of your purchase.
{% endblocktrans %}</p>

View File

@@ -106,7 +106,7 @@
</p>
<p>
{% blocktrans trimmed %}
The editor is tested with recent versions of Google Chome, Mozilla Firefox
The editor is tested with recent versions of Google Chrome, Mozilla Firefox
and Opera. Other browsers, especially Internet Explorer or Microsoft Edge, might
have problems displaying your background PDF or loading the correct fonts.
{% endblocktrans %}