CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Correct english typos (#662)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/base/models/vouchers.py
View File

@@ -198,9 +198,13 @@ class Voucher(LoggedModel):
@staticmethod
def clean_item_properties(data, event, quota, item, variation):
if quota:
if quota.event != event:
raise ValidationError(_('You cannot select a quota that belongs to a different event.'))
if item:
raise ValidationError(_('You cannot select a quota and a specific product at the same time.'))
elif item:
if item.event != event:
raise ValidationError(_('You cannot select an item that belongs to a different event.'))
if variation and (not item or not item.has_variations):
raise ValidationError(_('You cannot select a variation without having selected a product that provides '
'variations.'))

6
src/pretix/base/services/orders.py
View File

@@ -592,7 +592,11 @@ def send_expiry_warnings(sender, **kwargs):
'invoice_name': invoice_name,
'invoice_company': invoice_company,
}
email_subject = _('Your order is about to expire: %(code)s') % {'code': o.code}
if eventsettings.payment_term_expire_automatically:
email_subject = _('Your order is about to expire: %(code)s') % {'code': o.code}
else:
email_subject = _('Your order is pending payment: %(code)s') % {'code': o.code}
try:
o.send_mail(
email_subject, email_template, email_context,