From 8ee606f0d60153d7f39cc550aa6116ef0e3134cc Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Mon, 21 Mar 2016 18:04:47 +0100 Subject: [PATCH] Fixed an encoding error --- src/pretix/base/services/cart.py | 2 +- src/pretix/base/services/orders.py | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index 4c9299cb6..23cd9df72 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -3,7 +3,7 @@ from datetime import datetime, timedelta from django.conf import settings from django.db.models import Q 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 pretix.base.i18n import LazyLocaleException diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index 24ad47ace..85e832b5a 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -2,9 +2,8 @@ from datetime import datetime, timedelta from django.conf import settings from django.db import transaction -from django.utils import translation 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 pretix.base.i18n import ( @@ -79,19 +78,20 @@ def mark_order_paid(order: Order, provider: str=None, info: str=None, date: date }, user=user) order_paid.send(order.event, order=order) - mail( - 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={ - 'order': order.code, - 'secret': order.secret - }), - 'downloads': order.event.settings.get('ticket_download', as_type=bool) - }, - order.event, locale=order.locale - ) + with language(order.locale): + mail( + 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={ + 'order': order.code, + 'secret': order.secret + }), + 'downloads': order.event.settings.get('ticket_download', as_type=bool) + }, + order.event, locale=order.locale + ) return order