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

Fixed an encoding error

Browse Source
This commit is contained in:
Raphael Michel
2016-03-21 18:04:47 +01:00
parent 103fe2acca
commit 8ee606f0d6
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/services/cart.py
View File

@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
from django.conf import settings from django.conf import settings
from django.db.models import Q from django.db.models import Q
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext as _
from typing import List, Optional, Tuple from typing import List, Optional, Tuple
from pretix.base.i18n import LazyLocaleException from pretix.base.i18n import LazyLocaleException

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

@@ -2,9 +2,8 @@ from datetime import datetime, timedelta
from django.conf import settings from django.conf import settings
from django.db import transaction from django.db import transaction
from django.utils import translation
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext as _
from typing import List from typing import List
from pretix.base.i18n import ( from pretix.base.i18n import (
@@ -79,19 +78,20 @@ def mark_order_paid(order: Order, provider: str=None, info: str=None, date: date
}, user=user) }, user=user)
order_paid.send(order.event, order=order) order_paid.send(order.event, order=order)
mail( with language(order.locale):
order.email, _('Payment received for your order: %(code)s') % {'code': order.code}, mail(
order.event.settings.mail_text_order_paid, order.email, _('Payment received for your order: %(code)s') % {'code': order.code},
{ order.event.settings.mail_text_order_paid,
'event': order.event.name, {
'url': build_absolute_uri(order.event, 'presale:event.order', kwargs={ 'event': order.event.name,
'order': order.code, 'url': build_absolute_uri(order.event, 'presale:event.order', kwargs={
'secret': order.secret 'order': order.code,
}), 'secret': order.secret
'downloads': order.event.settings.get('ticket_download', as_type=bool) }),
}, 'downloads': order.event.settings.get('ticket_download', as_type=bool)
order.event, locale=order.locale },
) order.event, locale=order.locale
)
return order return order