diff --git a/src/pretix/api/views/order.py b/src/pretix/api/views/order.py index c0c79796ca..45e37dd457 100644 --- a/src/pretix/api/views/order.py +++ b/src/pretix/api/views/order.py @@ -680,28 +680,33 @@ class OrderViewSet(viewsets.ModelViewSet): ) if order.require_approval: email_template = request.event.settings.mail_text_order_placed_require_approval + subject_template = request.event.settings.mail_subject_order_placed_require_approval log_entry = 'pretix.event.order.email.order_placed_require_approval' email_attendees = False elif free_flow: email_template = request.event.settings.mail_text_order_free + subject_template = request.event.settings.mail_subject_order_free log_entry = 'pretix.event.order.email.order_free' email_attendees = request.event.settings.mail_send_order_free_attendee email_attendees_template = request.event.settings.mail_text_order_free_attendee + subject_attendees_template = request.event.settings.mail_subject_order_free_attendee else: email_template = request.event.settings.mail_text_order_placed + subject_template = request.event.settings.mail_subject_order_placed log_entry = 'pretix.event.order.email.order_placed' email_attendees = request.event.settings.mail_send_order_placed_attendee email_attendees_template = request.event.settings.mail_text_order_placed_attendee + subject_attendees_template = request.event.settings.mail_subject_order_placed_attendee _order_placed_email( - request.event, order, payment.payment_provider if payment else None, email_template, + request.event, order, payment.payment_provider if payment else None, email_template, subject_template, log_entry, invoice, payment, is_free=free_flow ) if email_attendees: for p in order.positions.all(): if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email: - _order_placed_email_attendee(request.event, order, p, email_attendees_template, log_entry, - is_free=free_flow) + _order_placed_email_attendee(request.event, order, p, email_attendees_template, subject_attendees_template, + log_entry, is_free=free_flow) if not free_flow and order.status == Order.STATUS_PAID and payment: payment._send_paid_mail(invoice, None, '') diff --git a/src/pretix/base/models/customers.py b/src/pretix/base/models/customers.py index fc8dbaf1b7..aa8e6b2b9e 100644 --- a/src/pretix/base/models/customers.py +++ b/src/pretix/base/models/customers.py @@ -262,7 +262,7 @@ class Customer(LoggedModel): ) + '?id=' + self.identifier + '&token=' + token mail( self.email, - _('Activate your account at {organizer}').format(organizer=self.organizer.name), + self.organizer.settings.mail_subject_customer_registration, self.organizer.settings.mail_text_customer_registration, ctx, locale=self.locale, diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 89198448cc..84370c5497 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -1027,7 +1027,7 @@ class Order(LockModel, LoggedModel): with language(self.locale, self.event.settings.region): email_template = self.event.settings.mail_text_resend_link email_context = get_email_context(event=self.event, order=self) - email_subject = _('Your order: %(code)s') % {'code': self.code} + email_subject = self.event.settings.mail_subject_resend_link self.send_mail( email_subject, email_template, email_context, 'pretix.event.order.email.resend', user=user, auth=auth, @@ -1738,8 +1738,8 @@ class OrderPayment(models.Model): with language(self.order.locale, self.order.event.settings.region): email_template = self.order.event.settings.mail_text_order_paid_attendee + email_subject = self.order.event.settings.mail_subject_order_paid_attendee email_context = get_email_context(event=self.order.event, order=self.order, position=position) - email_subject = _('Event registration confirmed: %(code)s') % {'code': self.order.code} try: position.send_mail( email_subject, email_template, email_context, @@ -1756,8 +1756,8 @@ class OrderPayment(models.Model): with language(self.order.locale, self.order.event.settings.region): email_template = self.order.event.settings.mail_text_order_paid + email_subject = self.order.event.settings.mail_subject_order_paid email_context = get_email_context(event=self.order.event, order=self.order, payment_info=mail_text) - email_subject = _('Payment received for your order: %(code)s') % {'code': self.order.code} try: self.order.send_mail( email_subject, email_template, email_context, @@ -2437,7 +2437,7 @@ class OrderPosition(AbstractPosition): with language(self.order.locale, self.order.event.settings.region): email_template = self.event.settings.mail_text_resend_link email_context = get_email_context(event=self.order.event, order=self.order, position=self) - email_subject = _('Your event registration: %(code)s') % {'code': self.order.code} + email_subject = self.event.settings.mail_subject_resend_link self.send_mail( email_subject, email_template, email_context, 'pretix.event.order.email.resend', user=user, auth=auth, diff --git a/src/pretix/base/models/waitinglist.py b/src/pretix/base/models/waitinglist.py index 0208e1c4ff..5e9002e296 100644 --- a/src/pretix/base/models/waitinglist.py +++ b/src/pretix/base/models/waitinglist.py @@ -216,7 +216,7 @@ class WaitingListEntry(LoggedModel): with language(self.locale, self.event.settings.region): mail( self.email, - _('You have been selected from the waitinglist for {event}').format(event=str(self.event)), + self.event.settings.mail_subject_waiting_list, self.event.settings.mail_text_waiting_list, get_email_context(event=self.event, waiting_list_entry=self), self.event, diff --git a/src/pretix/base/services/orders.py b/src/pretix/base/services/orders.py index 283b8ea7c4..c7167b190e 100644 --- a/src/pretix/base/services/orders.py +++ b/src/pretix/base/services/orders.py @@ -54,7 +54,7 @@ from django.db.transaction import get_connection from django.dispatch import receiver from django.utils.functional import cached_property from django.utils.timezone import make_aware, now -from django.utils.translation import gettext as _, gettext_lazy +from django.utils.translation import gettext as _ from django_scopes import scopes_disabled from pretix.api.models import OAuthApplication @@ -324,10 +324,10 @@ def approve_order(order, user=None, send_mail: bool=True, auth=None, force=False with language(order.locale, order.event.settings.region): if order.total == Decimal('0.00'): email_template = order.event.settings.mail_text_order_approved_free - email_subject = _('Order approved and confirmed: %(code)s') % {'code': order.code} + email_subject = order.event.settings.mail_subject_order_approved_free else: email_template = order.event.settings.mail_text_order_approved - email_subject = _('Order approved and awaiting payment: %(code)s') % {'code': order.code} + email_subject = order.event.settings.mail_subject_order_approved email_context = get_email_context(event=order.event, order=order) try: @@ -373,9 +373,9 @@ def deny_order(order, comment='', user=None, send_mail: bool=True, auth=None): if send_mail: email_template = order.event.settings.mail_text_order_denied + email_subject = order.event.settings.mail_subject_order_denied email_context = get_email_context(event=order.event, order=order, comment=comment) with language(order.locale, order.event.settings.region): - email_subject = _('Order denied: %(code)s') % {'code': order.code} try: order.send_mail( email_subject, email_template, email_context, @@ -491,10 +491,10 @@ def _cancel_order(order, user=None, send_mail: bool=True, api_token=None, device order.create_transactions() if send_mail: - email_template = order.event.settings.mail_text_order_canceled with language(order.locale, order.event.settings.region): + email_template = order.event.settings.mail_text_order_canceled + email_subject = order.event.settings.mail_subject_order_canceled email_context = get_email_context(event=order.event, order=order, comment=comment or "") - email_subject = _('Order canceled: %(code)s') % {'code': order.code} try: order.send_mail( email_subject, email_template, email_context, @@ -938,13 +938,12 @@ def _create_order(event: Event, email: str, positions: List[CartPosition], now_d return order, p -def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider, email_template, log_entry: str, - invoice, payment: OrderPayment, is_free=False): +def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider, email_template, subject_template, + log_entry: str, invoice, payment: OrderPayment, is_free=False): email_context = get_email_context(event=event, order=order, payment=payment if pprov else None) - email_subject = gettext_lazy('Your order: {code}') try: order.send_mail( - email_subject, email_template, email_context, + subject_template, email_template, email_context, log_entry, invoices=[invoice] if invoice and event.settings.invoice_email_attachment else [], attach_tickets=True, @@ -957,13 +956,13 @@ def _order_placed_email(event: Event, order: Order, pprov: BasePaymentProvider, logger.exception('Order received email could not be sent') -def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosition, email_template, log_entry: str, is_free=False): +def _order_placed_email_attendee(event: Event, order: Order, position: OrderPosition, email_template, subject_template, + log_entry: str, is_free=False): email_context = get_email_context(event=event, order=order, position=position) - email_subject = gettext_lazy('Your event registration: {code}') try: position.send_mail( - email_subject, email_template, email_context, + subject_template, email_template, email_context, log_entry, invoices=[], attach_tickets=True, @@ -1059,29 +1058,34 @@ def _perform_order(event: Event, payment_provider: str, position_ids: List[str], if order.email: if order.require_approval: email_template = event.settings.mail_text_order_placed_require_approval + subject_template = event.settings.mail_subject_order_placed_require_approval log_entry = 'pretix.event.order.email.order_placed_require_approval' email_attendees = False elif free_order_flow: email_template = event.settings.mail_text_order_free + subject_template = event.settings.mail_subject_order_free log_entry = 'pretix.event.order.email.order_free' email_attendees = event.settings.mail_send_order_free_attendee email_attendees_template = event.settings.mail_text_order_free_attendee + subject_attendees_template = event.settings.mail_subject_order_free_attendee else: email_template = event.settings.mail_text_order_placed + subject_template = event.settings.mail_subject_order_placed log_entry = 'pretix.event.order.email.order_placed' email_attendees = event.settings.mail_send_order_placed_attendee email_attendees_template = event.settings.mail_text_order_placed_attendee + subject_attendees_template = event.settings.mail_subject_order_placed_attendee if sales_channel in event.settings.mail_sales_channel_placed_paid: - _order_placed_email(event, order, pprov, email_template, log_entry, invoice, payment, + _order_placed_email(event, order, pprov, email_template, subject_template, log_entry, invoice, payment, is_free=free_order_flow) if email_attendees: for p in order.positions.all(): if p.addon_to_id is None and p.attendee_email and p.attendee_email != order.email: - _order_placed_email_attendee(event, order, p, email_attendees_template, log_entry, + _order_placed_email_attendee(event, order, p, email_attendees_template, subject_attendees_template, log_entry, is_free=free_order_flow) return order.id @@ -1135,9 +1139,9 @@ def send_expiry_warnings(sender, **kwargs): email_template = settings.mail_text_order_expire_warning email_context = get_email_context(event=o.event, order=o) if settings.payment_term_expire_automatically: - email_subject = _('Your order is about to expire: %(code)s') % {'code': o.code} + email_subject = settings.mail_subject_order_expire_warning else: - email_subject = _('Your order is pending payment: %(code)s') % {'code': o.code} + email_subject = settings.mail_subject_order_pending_warning try: o.send_mail( @@ -1210,8 +1214,8 @@ def send_download_reminders(sender, **kwargs): o.download_reminder_sent = True o.save(update_fields=['download_reminder_sent']) email_template = event.settings.mail_text_download_reminder + email_subject = event.settings.mail_subject_download_reminder email_context = get_email_context(event=event, order=o) - email_subject = _('Your ticket is ready for download: %(code)s') % {'code': o.code} try: o.send_mail( email_subject, email_template, email_context, @@ -1234,6 +1238,7 @@ def send_download_reminders(sender, **kwargs): continue if p.addon_to_id is None and p.attendee_email and p.attendee_email != o.email: email_template = event.settings.mail_text_download_reminder_attendee + email_subject = event.settings.mail_subject_download_reminder_attendee email_context = get_email_context(event=event, order=o, position=p) try: o.send_mail( @@ -1249,7 +1254,7 @@ def notify_user_changed_order(order, user=None, auth=None, invoices=[]): with language(order.locale, order.event.settings.region): email_template = order.event.settings.mail_text_order_changed email_context = get_email_context(event=order.event, order=order) - email_subject = _('Your order has been changed: %(code)s') % {'code': order.code} + email_subject = order.event.settings.mail_subject_order_changed try: order.send_mail( email_subject, email_template, email_context, diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 499359bd68..366db1f394 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -1708,6 +1708,14 @@ DEFAULTS = { 'type': LazyI18nString, 'default': "" }, + 'mail_subject_resend_link': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")), + }, + 'mail_subject_resend_link_attendee': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your event registration: {code}")), + }, 'mail_text_resend_link': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1721,6 +1729,10 @@ You can change your order details and view the status of your order at Best regards, Your {event} team""")) }, + 'mail_subject_resend_all_links': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your orders for {event}")), + }, 'mail_text_resend_all_links': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1733,6 +1745,10 @@ The list is as follows: Best regards, Your {event} team""")) }, + 'mail_subject_order_free_attendee': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your event registration: {code}")), + }, 'mail_text_order_free_attendee': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name}, @@ -1745,6 +1761,14 @@ You can view the details and status of your ticket here: Best regards, Your {event} team""")) }, + 'mail_send_order_free_attendee': { + 'type': bool, + 'default': 'False' + }, + 'mail_subject_order_free': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")), + }, 'mail_text_order_free': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1758,9 +1782,9 @@ You can change your order details and view the status of your order at Best regards, Your {event} team""")) }, - 'mail_send_order_free_attendee': { - 'type': bool, - 'default': 'False' + 'mail_subject_order_placed_require_approval': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")), }, 'mail_text_order_placed_require_approval': { 'type': LazyI18nString, @@ -1776,6 +1800,10 @@ You can change your order details and view the status of your order at Best regards, Your {event} team""")) }, + 'mail_subject_order_placed': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your order: {code}")), + }, 'mail_text_order_placed': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1819,6 +1847,10 @@ Your {event} team""")) 'type': bool, 'default': 'False' }, + 'mail_subject_order_placed_attendee': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your event registration: {code}")), + }, 'mail_text_order_placed_attendee': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name}, @@ -1831,6 +1863,10 @@ You can view the details and status of your ticket here: Best regards, Your {event} team""")) }, + 'mail_subject_order_changed': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your order has been changed: {code}")), + }, 'mail_text_order_changed': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1843,6 +1879,10 @@ You can view the status of your order at Best regards, Your {event} team""")) }, + 'mail_subject_order_paid': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Payment received for your order: {code}")), + }, 'mail_text_order_paid': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1861,6 +1901,10 @@ Your {event} team""")) 'type': bool, 'default': 'False' }, + 'mail_subject_order_paid_attendee': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Event registration confirmed: {code}")), + }, 'mail_text_order_paid_attendee': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name}, @@ -1888,6 +1932,14 @@ Your {event} team""")) 'type': int, 'default': '3' }, + 'mail_subject_order_expire_warning': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your order is about to expire: {code}")), + }, + 'mail_subject_order_pending_warning': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your order is pending payment: {code}")), + }, 'mail_text_order_expire_warning': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1902,6 +1954,10 @@ You can view the payment information and the status of your order at Best regards, Your {event} team""")) }, + 'mail_subject_waiting_list': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("You have been selected from the waitinglist for {event}")), + }, 'mail_text_waiting_list': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1931,6 +1987,10 @@ as possible to the next person on the waiting list: Best regards, Your {event} team""")) }, + 'mail_subject_order_canceled': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Order canceled: {code}")), + }, 'mail_text_order_canceled': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1945,6 +2005,10 @@ You can view the details of your order at Best regards, Your {event} team""")) }, + 'mail_subject_order_approved': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Order approved and awaiting payment: {code}")), + }, 'mail_text_order_approved': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1961,6 +2025,10 @@ You can select a payment method and perform the payment here: Best regards, Your {event} team""")) }, + 'mail_subject_order_approved_free': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Order approved and confirmed: {code}")), + }, 'mail_text_order_approved_free': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -1974,6 +2042,10 @@ You can change your order details and view the status of your order at Best regards, Your {event} team""")) }, + 'mail_subject_order_denied': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Order denied: {code}")), + }, 'mail_text_order_denied': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -2007,6 +2079,10 @@ Your {event} team""")) 'type': bool, 'default': 'False' }, + 'mail_subject_download_reminder_attendee': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your ticket is ready for download: {code}")), + }, 'mail_text_download_reminder_attendee': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello {attendee_name}, @@ -2019,6 +2095,10 @@ Your {event} team""")) Best regards, Your {event} team""")) }, + 'mail_subject_download_reminder': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Your ticket is ready for download: {code}")), + }, 'mail_text_download_reminder': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello, @@ -2031,6 +2111,10 @@ If you did not do so already, you can download your ticket here: Best regards, Your {event} team""")) }, + 'mail_subject_customer_registration': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Activate your account at {organizer}")), + }, 'mail_text_customer_registration': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello {name}, @@ -2049,6 +2133,10 @@ Best regards, Your {organizer} team""")) }, + 'mail_subject_customer_email_change': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Confirm email address for your account at {organizer}")), + }, 'mail_text_customer_email_change': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello {name}, @@ -2067,6 +2155,10 @@ Best regards, Your {organizer} team""")) }, + 'mail_subject_customer_reset': { + 'type': LazyI18nString, + 'default': LazyI18nString.from_gettext(gettext_noop("Set a new password for your account at {organizer}")), + }, 'mail_text_customer_reset': { 'type': LazyI18nString, 'default': LazyI18nString.from_gettext(gettext_noop("""Hello {name}, diff --git a/src/pretix/control/forms/event.py b/src/pretix/control/forms/event.py index b57076fc7d..9d02087252 100644 --- a/src/pretix/control/forms/event.py +++ b/src/pretix/control/forms/event.py @@ -927,6 +927,11 @@ class MailSettingsForm(SettingsForm): required=True, choices=[] ) + mail_subject_order_placed = I18nFormField( + label=_("Subject sent to order contact address"), + required=False, + widget=I18nTextInput, + ) mail_text_order_placed = I18nFormField( label=_("Text sent to order contact address"), required=False, @@ -938,12 +943,22 @@ class MailSettingsForm(SettingsForm): 'tickets, the following email will be sent out to the attendees.'), required=False, ) + mail_subject_order_placed_attendee = I18nFormField( + label=_("Subject sent to attendees"), + required=False, + widget=I18nTextInput, + ) mail_text_order_placed_attendee = I18nFormField( label=_("Text sent to attendees"), required=False, widget=I18nTextarea, ) + mail_subject_order_paid = I18nFormField( + label=_("Subject sent to order contact address"), + required=False, + widget=I18nTextInput, + ) mail_text_order_paid = I18nFormField( label=_("Text sent to order contact address"), required=False, @@ -955,12 +970,22 @@ class MailSettingsForm(SettingsForm): 'tickets, the following email will be sent out to the attendees.'), required=False, ) + mail_subject_order_paid_attendee = I18nFormField( + label=_("Subject sent to attendees"), + required=False, + widget=I18nTextInput, + ) mail_text_order_paid_attendee = I18nFormField( label=_("Text sent to attendees"), required=False, widget=I18nTextarea, ) + mail_subject_order_free = I18nFormField( + label=_("Subject sent to order contact address"), + required=False, + widget=I18nTextInput, + ) mail_text_order_free = I18nFormField( label=_("Text sent to order contact address"), required=False, @@ -972,22 +997,47 @@ class MailSettingsForm(SettingsForm): 'tickets, the following email will be sent out to the attendees.'), required=False, ) + mail_subject_order_free_attendee = I18nFormField( + label=_("Subject sent to attendees"), + required=False, + widget=I18nTextInput, + ) mail_text_order_free_attendee = I18nFormField( label=_("Text sent to attendees"), required=False, widget=I18nTextarea, ) + mail_subject_order_changed = I18nFormField( + label=_("Subject"), + required=False, + widget=I18nTextInput, + ) mail_text_order_changed = I18nFormField( label=_("Text"), required=False, widget=I18nTextarea, ) + mail_subject_resend_link = I18nFormField( + label=_("Subject (sent by admin)"), + required=False, + widget=I18nTextInput, + ) + mail_subject_resend_link_attendee = I18nFormField( + label=_("Subject (sent by admin to attendee)"), + required=False, + widget=I18nTextInput, + ) mail_text_resend_link = I18nFormField( label=_("Text (sent by admin)"), required=False, widget=I18nTextarea, ) + mail_subject_resend_all_links = I18nFormField( + label=_("Subject (requested by user)"), + required=False, + widget=I18nTextInput, + ) mail_text_resend_all_links = I18nFormField( label=_("Text (requested by user)"), required=False, @@ -1005,11 +1055,31 @@ class MailSettingsForm(SettingsForm): required=False, widget=I18nTextarea, ) + mail_subject_order_expire_warning = I18nFormField( + label=_("Subject (if order will expire automatically)"), + required=False, + widget=I18nTextInput, + ) + mail_subject_order_pending_warning = I18nFormField( + label=_("Subject (if order will not expire automatically)"), + required=False, + widget=I18nTextInput, + ) + mail_subject_waiting_list = I18nFormField( + label=_("Subject"), + required=False, + widget=I18nTextInput, + ) mail_text_waiting_list = I18nFormField( label=_("Text"), required=False, widget=I18nTextarea, ) + mail_subject_order_canceled = I18nFormField( + label=_("Subject"), + required=False, + widget=I18nTextInput, + ) mail_text_order_canceled = I18nFormField( label=_("Text"), required=False, @@ -1020,6 +1090,11 @@ class MailSettingsForm(SettingsForm): required=False, widget=I18nTextarea, ) + mail_subject_download_reminder = I18nFormField( + label=_("Subject sent to order contact address"), + required=False, + widget=I18nTextInput, + ) mail_text_download_reminder = I18nFormField( label=_("Text sent to order contact address"), required=False, @@ -1031,6 +1106,11 @@ class MailSettingsForm(SettingsForm): 'tickets, the following email will be sent out to the attendees.'), required=False, ) + mail_subject_download_reminder_attendee = I18nFormField( + label=_("Subject sent to attendees"), + required=False, + widget=I18nTextInput, + ) mail_text_download_reminder_attendee = I18nFormField( label=_("Text sent to attendees"), required=False, @@ -1043,50 +1123,90 @@ class MailSettingsForm(SettingsForm): help_text=_("This email will be sent out this many days before the order event starts. If the " "field is empty, the mail will never be sent.") ) + mail_subject_order_placed_require_approval = I18nFormField( + label=_("Subject for received order"), + required=False, + widget=I18nTextInput, + ) mail_text_order_placed_require_approval = I18nFormField( - label=_("Received order"), + label=_("Text for received order"), required=False, widget=I18nTextarea, ) + mail_subject_order_approved = I18nFormField( + label=_("Subject for approved order"), + required=False, + widget=I18nTextInput, + ) mail_text_order_approved = I18nFormField( - label=_("Approved order"), + label=_("Text for approved order"), required=False, widget=I18nTextarea, help_text=_("This will only be sent out for non-free orders. Free orders will receive the free order " "template from below instead."), ) + mail_subject_order_approved_free = I18nFormField( + label=_("Subject for approved free order"), + required=False, + widget=I18nTextInput, + ) mail_text_order_approved_free = I18nFormField( - label=_("Approved free order"), + label=_("Text for approved free order"), required=False, widget=I18nTextarea, help_text=_("This will only be sent out for free orders. Non-free orders will receive the non-free order " "template from above instead."), ) + mail_subject_order_denied = I18nFormField( + label=_("Subject for denied order"), + required=False, + widget=I18nTextInput, + ) mail_text_order_denied = I18nFormField( - label=_("Denied order"), + label=_("Text for denied order"), required=False, widget=I18nTextarea, ) base_context = { 'mail_text_order_placed': ['event', 'order', 'payment'], + 'mail_subject_order_placed': ['event', 'order', 'payment'], 'mail_text_order_placed_attendee': ['event', 'order', 'position'], + 'mail_subject_order_placed_attendee': ['event', 'order', 'position'], 'mail_text_order_placed_require_approval': ['event', 'order'], + 'mail_subject_order_placed_require_approval': ['event', 'order'], 'mail_text_order_approved': ['event', 'order'], + 'mail_subject_order_approved': ['event', 'order'], 'mail_text_order_approved_free': ['event', 'order'], + 'mail_subject_order_approved_free': ['event', 'order'], 'mail_text_order_denied': ['event', 'order', 'comment'], + 'mail_subject_order_denied': ['event', 'order', 'comment'], 'mail_text_order_paid': ['event', 'order', 'payment_info'], + 'mail_subject_order_paid': ['event', 'order', 'payment_info'], 'mail_text_order_paid_attendee': ['event', 'order', 'position'], + 'mail_subject_order_paid_attendee': ['event', 'order', 'position'], 'mail_text_order_free': ['event', 'order'], + 'mail_subject_order_free': ['event', 'order'], 'mail_text_order_free_attendee': ['event', 'order', 'position'], + 'mail_subject_order_free_attendee': ['event', 'order', 'position'], 'mail_text_order_changed': ['event', 'order'], + 'mail_subject_order_changed': ['event', 'order'], 'mail_text_order_canceled': ['event', 'order', 'comment'], + 'mail_subject_order_canceled': ['event', 'order', 'comment'], 'mail_text_order_expire_warning': ['event', 'order'], + 'mail_subject_order_expire_warning': ['event', 'order'], + 'mail_subject_order_pending_warning': ['event', 'order'], 'mail_text_order_custom_mail': ['event', 'order'], 'mail_text_download_reminder': ['event', 'order'], + 'mail_subject_download_reminder': ['event', 'order'], 'mail_text_download_reminder_attendee': ['event', 'order', 'position'], + 'mail_subject_download_reminder_attendee': ['event', 'order', 'position'], 'mail_text_resend_link': ['event', 'order'], + 'mail_subject_resend_link': ['event', 'order'], + 'mail_subject_resend_link_attendee': ['event', 'order'], 'mail_text_waiting_list': ['event', 'waiting_list_entry'], + 'mail_subject_waiting_list': ['event', 'waiting_list_entry'], 'mail_text_resend_all_links': ['event', 'orders'], + 'mail_subject_resend_all_links': ['event', 'orders'], 'mail_attach_ical_description': ['event', 'event_or_subevent'], } diff --git a/src/pretix/control/forms/organizer.py b/src/pretix/control/forms/organizer.py index 254d416279..d43d138a46 100644 --- a/src/pretix/control/forms/organizer.py +++ b/src/pretix/control/forms/organizer.py @@ -45,7 +45,9 @@ from django.utils.crypto import get_random_string from django.utils.safestring import mark_safe from django.utils.translation import gettext_lazy as _, pgettext_lazy from django_scopes.forms import SafeModelMultipleChoiceField -from i18nfield.forms import I18nFormField, I18nFormSetMixin, I18nTextarea +from i18nfield.forms import ( + I18nFormField, I18nFormSetMixin, I18nTextarea, I18nTextInput, +) from phonenumber_field.formfields import PhoneNumberField from pytz import common_timezones @@ -457,16 +459,31 @@ class MailSettingsForm(SettingsForm): }} ) + mail_subject_customer_registration = I18nFormField( + label=_("Subject"), + required=False, + widget=I18nTextInput, + ) mail_text_customer_registration = I18nFormField( label=_("Text"), required=False, widget=I18nTextarea, ) + mail_subject_customer_email_change = I18nFormField( + label=_("Subject"), + required=False, + widget=I18nTextInput, + ) mail_text_customer_email_change = I18nFormField( label=_("Text"), required=False, widget=I18nTextarea, ) + mail_subject_customer_reset = I18nFormField( + label=_("Subject"), + required=False, + widget=I18nTextInput, + ) mail_text_customer_reset = I18nFormField( label=_("Text"), required=False, @@ -475,8 +492,11 @@ class MailSettingsForm(SettingsForm): base_context = { 'mail_text_customer_registration': ['customer', 'url'], + 'mail_subject_customer_registration': ['customer', 'url'], 'mail_text_customer_email_change': ['customer', 'url'], + 'mail_subject_customer_email_change': ['customer', 'url'], 'mail_text_customer_reset': ['customer', 'url'], + 'mail_subject_customer_reset': ['customer', 'url'], } def _get_sample_context(self, base_parameters): diff --git a/src/pretix/control/templates/pretixcontrol/event/mail.html b/src/pretix/control/templates/pretixcontrol/event/mail.html index 1148e339d9..b3802f2f70 100644 --- a/src/pretix/control/templates/pretixcontrol/event/mail.html +++ b/src/pretix/control/templates/pretixcontrol/event/mail.html @@ -88,37 +88,37 @@

{% trans "Text" %}

{% blocktrans asvar title_placed_order %}Placed order{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_text_order_placed,mail_send_order_placed_attendee,mail_text_order_placed_attendee" exclude="mail_send_order_placed_attendee" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_placed" title=title_placed_order items="mail_subject_order_placed,mail_text_order_placed,mail_send_order_placed_attendee,mail_subject_order_placed_attendee,mail_text_order_placed_attendee" exclude="mail_send_order_placed_attendee" %} {% blocktrans asvar title_paid_order %}Paid order{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_text_order_paid,mail_send_order_paid_attendee,mail_text_order_paid_attendee" exclude="mail_send_order_paid_attendee" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_paid" title=title_paid_order items="mail_subject_order_paid,mail_text_order_paid,mail_send_order_paid_attendee,mail_subject_order_paid_attendee,mail_text_order_paid_attendee" exclude="mail_send_order_paid_attendee" %} {% blocktrans asvar title_free_order %}Free order{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_text_order_free,mail_send_order_free_attendee,mail_text_order_free_attendee" exclude="mail_send_order_free_attendee" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_free" title=title_free_order items="mail_subject_order_free,mail_text_order_free,mail_send_order_free_attendee,mail_subject_order_free_attendee,mail_text_order_free_attendee" exclude="mail_send_order_free_attendee" %} {% blocktrans asvar title_resend_link %}Resend link{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_text_resend_link,mail_text_resend_all_links" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="resend_link" title=title_resend_link items="mail_subject_resend_link,mail_subject_resend_link_attendee,mail_text_resend_link,mail_subject_resend_all_links,mail_text_resend_all_links" %} {% blocktrans asvar title_order_changed %}Order changed{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_text_order_changed" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_changed" title=title_order_changed items="mail_subject_order_changed,mail_text_order_changed" %} {% blocktrans asvar title_payment_reminder %}Payment reminder{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_expirew" title=title_payment_reminder items="mail_days_order_expire_warning,mail_subject_order_expire_warning,mail_subject_order_pending_warning,mail_text_order_expire_warning" exclude="mail_days_order_expire_warning" %} {% blocktrans asvar title_waiting_list_notification %}Waiting list notification{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_text_waiting_list" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="waiting_list" title=title_waiting_list_notification items="mail_subject_waiting_list,mail_text_waiting_list" %} {% blocktrans asvar title_order_canceled %}Order canceled{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_text_order_canceled" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="order_canceled" title=title_order_canceled items="mail_subject_order_canceled,mail_text_order_canceled" %} {% blocktrans asvar title_order_custom_mail %}Order custom mail{% endblocktrans %} {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="custom_mail" title=title_order_custom_mail items="mail_text_order_custom_mail" %} {% blocktrans asvar title_download_tickets_reminder %}Reminder to download tickets{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_text_download_reminder_attendee,mail_sales_channel_download_reminder" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee,mail_sales_channel_download_reminder" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_download_tickets_reminder items="mail_days_download_reminder,mail_subject_download_reminder,mail_text_download_reminder,mail_send_download_reminder_attendee,mail_subject_download_reminder_attendee,mail_text_download_reminder_attendee,mail_sales_channel_download_reminder" exclude="mail_days_download_reminder,mail_send_download_reminder_attendee,mail_sales_channel_download_reminder" %} {% blocktrans asvar title_require_approval %}Order approval process{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval items="mail_text_order_placed_require_approval,mail_text_order_approved,mail_text_order_approved_free,mail_text_order_denied" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="ticket_reminder" title=title_require_approval items="mail_subject_order_placed_require_approval,mail_text_order_placed_require_approval,mail_subject_order_approved,mail_text_order_approved,mail_subject_order_approved_free,mail_text_order_approved_free,mail_subject_order_denied,mail_text_order_denied" %}

{% trans "Attachments" %}

{% bootstrap_field form.mail_attachment_new_order layout="control" %} diff --git a/src/pretix/control/templates/pretixcontrol/organizers/mail.html b/src/pretix/control/templates/pretixcontrol/organizers/mail.html index 1119d46f10..adb8aadc2d 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/mail.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/mail.html @@ -58,13 +58,13 @@ {% trans "E-mail content" %}
{% blocktrans asvar title_customer_registration %}Customer account registration{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="customer_registration" title=title_customer_registration items="mail_text_customer_registration" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="customer_registration" title=title_customer_registration items="mail_subject_customer_registration,mail_text_customer_registration" %} {% blocktrans asvar title_email_change %}Customer account email change{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="email_change" title=title_email_change items="mail_text_customer_email_change" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="email_change" title=title_email_change items="mail_subject_customer_email_change,mail_text_customer_email_change" %} {% blocktrans asvar title_reset %}Customer account password reset{% endblocktrans %} - {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="reset" title=title_reset items="mail_text_customer_reset" %} + {% include "pretixcontrol/event/mail_settings_fragment.html" with pid="reset" title=title_reset items="mail_subject_customer_reset,mail_text_customer_reset" %}
diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index 6f1d3e2f9a..2583ae29a4 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -41,6 +41,7 @@ from decimal import Decimal from itertools import groupby from urllib.parse import urlsplit +import bleach from django.conf import settings from django.contrib import messages from django.contrib.contenttypes.models import ContentType @@ -732,9 +733,12 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View): idx = matched.group('idx') if idx in self.supported_locale: with language(self.supported_locale[idx], self.request.event.settings.region): - msgs[self.supported_locale[idx]] = markdown_compile_email( - v.format_map(self.placeholders(preview_item)) - ) + if k.startswith('mail_subject_'): + msgs[self.supported_locale[idx]] = bleach.clean(v).format_map(self.placeholders(preview_item)) + else: + msgs[self.supported_locale[idx]] = markdown_compile_email( + v.format_map(self.placeholders(preview_item)) + ) return JsonResponse({ 'item': preview_item, diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py index b756fd5698..59b6a80a84 100644 --- a/src/pretix/control/views/organizer.py +++ b/src/pretix/control/views/organizer.py @@ -37,6 +37,7 @@ import re from datetime import timedelta from decimal import Decimal +import bleach from django import forms from django.conf import settings from django.contrib import messages @@ -333,9 +334,12 @@ class MailSettingsPreview(OrganizerPermissionRequiredMixin, View): idx = matched.group('idx') if idx in self.supported_locale: with language(self.supported_locale[idx], self.request.organizer.settings.region): - msgs[self.supported_locale[idx]] = markdown_compile_email( - v.format_map(self.placeholders(preview_item)) - ) + if k.startswith('mail_subject_'): + msgs[self.supported_locale[idx]] = bleach.clean(v).format_map(self.placeholders(preview_item)) + else: + msgs[self.supported_locale[idx]] = markdown_compile_email( + v.format_map(self.placeholders(preview_item)) + ) return JsonResponse({ 'item': preview_item, @@ -2236,7 +2240,7 @@ class CustomerDetailView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMi ) + '?id=' + self.customer.identifier + '&token=' + token mail( self.customer.email, - _('Set a new password for your account at {organizer}').format(organizer=self.request.organizer.name), + self.request.organizer.settings.mail_subject_customer_reset, self.request.organizer.settings.mail_text_customer_reset, ctx, locale=self.customer.locale, diff --git a/src/pretix/locale/ar/LC_MESSAGES/django.po b/src/pretix/locale/ar/LC_MESSAGES/django.po index 954f093358..18aec89a78 100644 --- a/src/pretix/locale/ar/LC_MESSAGES/django.po +++ b/src/pretix/locale/ar/LC_MESSAGES/django.po @@ -4429,13 +4429,13 @@ msgstr "معلومات الدفع" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "تم تأكيد تسجيل الفعالية: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "تم تأكيد تسجيل الفعالية: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "تم إستلام الدفع لطلبك: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "تم إستلام الدفع لطلبك: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6823,18 +6823,18 @@ msgstr "هذا الطلب ليس في انتظار الموافقة." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "تمت الموافقة على الطلب وتأكيده: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "تمت الموافقة على الطلب وتأكيده: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "تمت الموافقة على الطلب وفي انتظار الدفع: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "تمت الموافقة على الطلب وفي انتظار الدفع: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "الطلب مرفوض: %(code)s" +msgid "Order denied: {code}" +msgstr "الطلب مرفوض: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6857,8 +6857,8 @@ msgstr "لا يمكن أن تكون رسوم الإلغاء أعلى من رصي #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "تم إلغاء الطلب: %(code)s" +msgid "Order canceled: {code}" +msgstr "تم إلغاء الطلب: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6882,23 +6882,23 @@ msgstr "تسجيل الفعالية الخاصة بك:{code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "طلبك على وشك الانتهاء: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "طلبك على وشك الانتهاء: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "طلبك في انتظار الدفع: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "طلبك في انتظار الدفع: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "تذكرتك جاهزة للتنزيل: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "تذكرتك جاهزة للتنزيل: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "تم تغيير طلبك: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "تم تغيير طلبك: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -28614,8 +28614,8 @@ msgstr "" "المرغوب فيها والتحقق مرة أخرى من أنك استخدمت عنوان البريد الإلكتروني الصحيح." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "طلباتكم ل{}" +msgid "Your orders for {event}" +msgstr "طلباتكم ل{event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/ca/LC_MESSAGES/django.po b/src/pretix/locale/ca/LC_MESSAGES/django.po index e6d93317fc..cf646cfcaf 100644 --- a/src/pretix/locale/ca/LC_MESSAGES/django.po +++ b/src/pretix/locale/ca/LC_MESSAGES/django.po @@ -4478,13 +4478,13 @@ msgstr "Dades de pagament" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Registre confirmat: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Registre confirmat: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "S'ha rebut el pagament per a la vostra comanda: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "S'ha rebut el pagament per a la vostra comanda: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6963,18 +6963,18 @@ msgstr "Aquesta comanda no està pendent d'aprovació." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "S'ha confirmat i aprovat la comanda: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "S'ha confirmat i aprovat la comanda: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "S'ha aprovat i està pendent de pagament la comanda: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "S'ha aprovat i està pendent de pagament la comanda: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "S'ha denegat la comanda: %(code)s" +msgid "Order denied: {code}" +msgstr "S'ha denegat la comanda: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6997,8 +6997,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "S'ha cancel·lat la comanda: %(code)s" +msgid "Order canceled: {code}" +msgstr "S'ha cancel·lat la comanda: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -7019,23 +7019,23 @@ msgstr "El vostre registre: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "La vostra comanda està a punt d'expirar: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "La vostra comanda està a punt d'expirar: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "La vostra comanda està pendent de pagament: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "La vostra comanda està pendent de pagament: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Està llest per la descàrrega el vostre tiquet: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Està llest per la descàrrega el vostre tiquet: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Ha canviat la vostra comanda: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Ha canviat la vostra comanda: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -28351,8 +28351,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Les vostres comandes per a {}" +msgid "Your orders for {event}" +msgstr "Les vostres comandes per a {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/cs/LC_MESSAGES/django.po b/src/pretix/locale/cs/LC_MESSAGES/django.po index 5a27336ea1..60afc0c7cf 100644 --- a/src/pretix/locale/cs/LC_MESSAGES/django.po +++ b/src/pretix/locale/cs/LC_MESSAGES/django.po @@ -4374,13 +4374,13 @@ msgstr "Informace o platbě" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Registrace události potvrzena: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Registrace události potvrzena: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Přijatá platba za vaši objednávku: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Přijatá platba za vaši objednávku: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6679,8 +6679,8 @@ msgstr "Tato objednávka není předmětem schvalování." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Schválená a potvrzená objednávka: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Schválená a potvrzená objednávka: {code}" #: pretix/base/services/orders.py:330 #, python-format @@ -6689,8 +6689,8 @@ msgstr "" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Odmítnutí objednávky: %(code)s" +msgid "Order denied: {code}" +msgstr "Odmítnutí objednávky: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6711,8 +6711,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Zrušená objednávka: %(code)s" +msgid "Order canceled: {code}" +msgstr "Zrušená objednávka: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6748,8 +6748,8 @@ msgstr "" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Vaše objednávka byla změněna: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Vaše objednávka byla změněna: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -26302,7 +26302,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/da/LC_MESSAGES/django.po b/src/pretix/locale/da/LC_MESSAGES/django.po index c4026f44c8..82e606f7cb 100644 --- a/src/pretix/locale/da/LC_MESSAGES/django.po +++ b/src/pretix/locale/da/LC_MESSAGES/django.po @@ -4394,13 +4394,13 @@ msgstr "Betalingsoplysninger" #: pretix/base/models/orders.py:1742 #, fuzzy, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Bestilling annulleret: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Bestilling annulleret: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Betaling modtaget for din bestilling: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Betaling modtaget for din bestilling: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6781,18 +6781,18 @@ msgstr "Denne ordre afventer ikke godkendelse." #: pretix/base/services/orders.py:327 #, fuzzy, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Bestilling annulleret: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Bestilling annulleret: {code}" #: pretix/base/services/orders.py:330 #, fuzzy, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Din bestilling afventer betaling: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Din bestilling afventer betaling: {code}" #: pretix/base/services/orders.py:378 #, fuzzy, python-format -msgid "Order denied: %(code)s" -msgstr "Bestillingsdetaljer: %(code)s" +msgid "Order denied: {code}" +msgstr "Bestillingsdetaljer: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6813,8 +6813,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Bestilling annulleret: %(code)s" +msgid "Order canceled: {code}" +msgstr "Bestilling annulleret: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6835,23 +6835,23 @@ msgstr "Din bestilling: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Din bestilling er ved at udløbe: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Din bestilling er ved at udløbe: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Din bestilling afventer betaling: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Din bestilling afventer betaling: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Din billet er klar til download: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Din billet er klar til download: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Din bestilling er blevet ændret: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Din bestilling er blevet ændret: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -27554,8 +27554,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Dine bestillinger af {}" +msgid "Your orders for {event}" +msgstr "Dine bestillinger af {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/de/LC_MESSAGES/django.po b/src/pretix/locale/de/LC_MESSAGES/django.po index 35d7c884bc..d6029ce7b8 100644 --- a/src/pretix/locale/de/LC_MESSAGES/django.po +++ b/src/pretix/locale/de/LC_MESSAGES/django.po @@ -4407,13 +4407,13 @@ msgstr "Zahlungsinformationen" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Registrierung bestätigt: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Registrierung bestätigt: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Zahlung erhalten für die Bestellung: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Zahlung erhalten für die Bestellung: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6835,18 +6835,18 @@ msgstr "Diese Bestellung wartet nicht auf Freigabe." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Bestellung bestätigt: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Bestellung bestätigt: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Bestellung freigegeben und wartet auf Bezahlung: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Bestellung freigegeben und wartet auf Bezahlung: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Bestellung abgelehnt: %(code)s" +msgid "Order denied: {code}" +msgstr "Bestellung abgelehnt: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6871,8 +6871,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Bestellung storniert: %(code)s" +msgid "Order canceled: {code}" +msgstr "Bestellung storniert: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6898,23 +6898,23 @@ msgstr "Ihre Registrierung: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Ihre Bestellung läuft bald ab: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Ihre Bestellung läuft bald ab: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Ihre Bestellung wurde noch nicht bezahlt: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Ihre Bestellung wurde noch nicht bezahlt: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Ihr Ticket ist zum Download verfügbar: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Ihr Ticket ist zum Download verfügbar: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Ihre Bestellung wurde geändert: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Ihre Bestellung wurde geändert: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -28715,8 +28715,8 @@ msgstr "" "Mail-Adresse verwendet haben." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Ihre Bestellungen für {}" +msgid "Your orders for {event}" +msgstr "Ihre Bestellungen für {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po index 3aaff991e3..e6763e541a 100644 --- a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po +++ b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po @@ -4404,13 +4404,13 @@ msgstr "Zahlungsinformationen" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Registrierung bestätigt: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Registrierung bestätigt: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Zahlung erhalten für die Bestellung: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Zahlung erhalten für die Bestellung: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6825,18 +6825,18 @@ msgstr "Diese Bestellung wartet nicht auf Freigabe." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Bestellung bestätigt: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Bestellung bestätigt: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Bestellung freigegeben und wartet auf Bezahlung: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Bestellung freigegeben und wartet auf Bezahlung: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Bestellung abgelehnt: %(code)s" +msgid "Order denied: {code}" +msgstr "Bestellung abgelehnt: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6861,8 +6861,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Bestellung storniert: %(code)s" +msgid "Order canceled: {code}" +msgstr "Bestellung storniert: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6888,23 +6888,23 @@ msgstr "Deine Registrierung: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Deine Bestellung läuft bald ab: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Deine Bestellung läuft bald ab: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Deine Bestellung wurde noch nicht bezahlt: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Deine Bestellung wurde noch nicht bezahlt: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Dein Ticket ist zum Download verfügbar: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Dein Ticket ist zum Download verfügbar: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Deine Bestellung wurde geändert: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Deine Bestellung wurde geändert: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -28658,8 +28658,8 @@ msgstr "" "Adresse verwendet hast." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Deine Bestellungen für {}" +msgid "Your orders for {event}" +msgstr "Deine Bestellungen für {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/django.pot b/src/pretix/locale/django.pot index 98b69508ab..0df88378ba 100644 --- a/src/pretix/locale/django.pot +++ b/src/pretix/locale/django.pot @@ -25448,7 +25448,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/el/LC_MESSAGES/django.po b/src/pretix/locale/el/LC_MESSAGES/django.po index 6da6d03681..45ffd5017d 100644 --- a/src/pretix/locale/el/LC_MESSAGES/django.po +++ b/src/pretix/locale/el/LC_MESSAGES/django.po @@ -4671,13 +4671,13 @@ msgstr "Πληροφορίες πληρωμής" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Επιβεβαίωση εγγραφής εκδήλωσης: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Επιβεβαίωση εγγραφής εκδήλωσης: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Η πληρωμή που λάβατε για την παραγγελία σας: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Η πληρωμή που λάβατε για την παραγγελία σας: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -7304,18 +7304,18 @@ msgstr "Αυτή η παραγγελία δεν εκκρεμεί έγκριση. #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Η παραγγελία εγκρίθηκε και επιβεβαιώθηκε: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Η παραγγελία εγκρίθηκε και επιβεβαιώθηκε: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Η παραγγελία εγκρίνεται και αναμένεται πληρωμή: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Η παραγγελία εγκρίνεται και αναμένεται πληρωμή: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Η παραγγελία απορρίφθηκε: %(code)s" +msgid "Order denied: {code}" +msgstr "Η παραγγελία απορρίφθηκε: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -7338,8 +7338,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Παραγγελία ακυρώθηκε: %(code)s" +msgid "Order canceled: {code}" +msgstr "Παραγγελία ακυρώθηκε: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -7360,23 +7360,23 @@ msgstr "Η εγγραφή σας στην εκδήλωση: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Η παραγγελία σας πρόκειται να λήξει: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Η παραγγελία σας πρόκειται να λήξει: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Η παραγγελία σας εκκρεμεί πληρωμή: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Η παραγγελία σας εκκρεμεί πληρωμή: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Το εισιτήριό σας είναι έτοιμο για λήψη: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Το εισιτήριό σας είναι έτοιμο για λήψη: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Η παραγγελία σας έχει αλλάξει: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Η παραγγελία σας έχει αλλάξει: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -30541,8 +30541,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Οι παραγγελίες σας για {}" +msgid "Your orders for {event}" +msgstr "Οι παραγγελίες σας για {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/es/LC_MESSAGES/django.po b/src/pretix/locale/es/LC_MESSAGES/django.po index 501237cf1e..92801562d2 100644 --- a/src/pretix/locale/es/LC_MESSAGES/django.po +++ b/src/pretix/locale/es/LC_MESSAGES/django.po @@ -4584,13 +4584,13 @@ msgstr "Información de pago" #: pretix/base/models/orders.py:1742 #, fuzzy, python-format #| msgid "Order approved and confirmed: %(code)s" -msgid "Event registration confirmed: %(code)s" -msgstr "Pedido aprobado y confirmado: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Pedido aprobado y confirmado: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Pago recibido por su pedido: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Pago recibido por su pedido: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -7165,18 +7165,18 @@ msgstr "Esta orden no está pendiente de aprobación." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Pedido aprobado y confirmado: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Pedido aprobado y confirmado: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Orden aprobada y pendiente de pago: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Orden aprobada y pendiente de pago: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Orden denegada: %(code)s" +msgid "Order denied: {code}" +msgstr "Orden denegada: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -7201,8 +7201,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Pedido cancelado: %(code)s" +msgid "Order canceled: {code}" +msgstr "Pedido cancelado: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -7228,23 +7228,23 @@ msgstr "Su pedido: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Su pedido está a punto de caducar: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Su pedido está a punto de caducar: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Su pedido está pendiente de pago: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Su pedido está pendiente de pago: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Su ticket está listo para descargar: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Su ticket está listo para descargar: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Su pedido ha sido modificado: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Su pedido ha sido modificado: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -30234,8 +30234,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Tus ordenes para {}" +msgid "Your orders for {event}" +msgstr "Tus ordenes para {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/fi/LC_MESSAGES/django.po b/src/pretix/locale/fi/LC_MESSAGES/django.po index aad19cf69b..35f3769a76 100644 --- a/src/pretix/locale/fi/LC_MESSAGES/django.po +++ b/src/pretix/locale/fi/LC_MESSAGES/django.po @@ -4165,8 +4165,8 @@ msgstr "" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Tilauksesi %(code)s maksu vastaanotettu" +msgid "Payment received for your order: {code}" +msgstr "Tilauksesi {code} maksu vastaanotettu" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6412,8 +6412,8 @@ msgstr "" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Lippusi on valmis ladattavaksi: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Lippusi on valmis ladattavaksi: {code}" #: pretix/base/services/orders.py:1252 #, python-format @@ -25760,7 +25760,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/fr/LC_MESSAGES/django.po b/src/pretix/locale/fr/LC_MESSAGES/django.po index 363f67b848..01a651cb3b 100644 --- a/src/pretix/locale/fr/LC_MESSAGES/django.po +++ b/src/pretix/locale/fr/LC_MESSAGES/django.po @@ -4670,13 +4670,13 @@ msgstr "Informations de paiement" #: pretix/base/models/orders.py:1742 #, fuzzy, python-format #| msgid "Order canceled: %(code)s" -msgid "Event registration confirmed: %(code)s" -msgstr "Commande annulée: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Commande annulée: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Paiement reçu pour votre commande: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Paiement reçu pour votre commande: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -7321,20 +7321,20 @@ msgstr "Cette commande n'est pas marquée comme payée." #: pretix/base/services/orders.py:327 #, fuzzy, python-format #| msgid "Order canceled: %(code)s" -msgid "Order approved and confirmed: %(code)s" -msgstr "Commande annulée: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Commande annulée: {code}" #: pretix/base/services/orders.py:330 #, fuzzy, python-format #| msgid "Your order is pending payment: %(code)s" -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Votre commande est en attente de paiement: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Votre commande est en attente de paiement: {code}" #: pretix/base/services/orders.py:378 #, fuzzy, python-format #| msgid "Order details: %(code)s" -msgid "Order denied: %(code)s" -msgstr "Détails de la commande: %(code)s" +msgid "Order denied: {code}" +msgstr "Détails de la commande: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -7355,8 +7355,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Commande annulée: %(code)s" +msgid "Order canceled: {code}" +msgstr "Commande annulée: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -7378,23 +7378,23 @@ msgstr "Votre commande: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Votre commande est sur le point d'expirer: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Votre commande est sur le point d'expirer: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Votre commande est en attente de paiement: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Votre commande est en attente de paiement: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Votre ticket est prêt à être téléchargé: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Votre ticket est prêt à être téléchargé: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Votre commande a été modifiée: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Votre commande a été modifiée: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -30860,8 +30860,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Vos ordres pour {}" +msgid "Your orders for {event}" +msgstr "Vos ordres pour {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/gl/LC_MESSAGES/django.po b/src/pretix/locale/gl/LC_MESSAGES/django.po index 240dfca714..886ace4535 100644 --- a/src/pretix/locale/gl/LC_MESSAGES/django.po +++ b/src/pretix/locale/gl/LC_MESSAGES/django.po @@ -4641,13 +4641,13 @@ msgstr "Información de pago" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Pedido aprobado e confirmado: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Pedido aprobado e confirmado: {code}" #: pretix/base/models/orders.py:1760 #, fuzzy, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Pago recibido por su pedido: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Pago recibido por su pedido: {code}" #: pretix/base/models/orders.py:1870 #, fuzzy @@ -7301,18 +7301,18 @@ msgstr "Esta orden no está pendiente de aprobación." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Pedido aprobado e confirmado: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Pedido aprobado e confirmado: {code}" #: pretix/base/services/orders.py:330 #, fuzzy, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Orden aprobada y pendiente de pago: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Orden aprobada y pendiente de pago: {code}" #: pretix/base/services/orders.py:378 #, fuzzy, python-format -msgid "Order denied: %(code)s" -msgstr "Orden denegada: %(code)s" +msgid "Order denied: {code}" +msgstr "Orden denegada: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -7338,8 +7338,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, fuzzy, python-format -msgid "Order canceled: %(code)s" -msgstr "Pedido cancelado: %(code)s" +msgid "Order canceled: {code}" +msgstr "Pedido cancelado: {code}" #: pretix/base/services/orders.py:915 #, fuzzy @@ -7365,23 +7365,23 @@ msgstr "Su pedido: {code}" #: pretix/base/services/orders.py:1138 #, fuzzy, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Su pedido está a punto de caducar: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Su pedido está a punto de caducar: {code}" #: pretix/base/services/orders.py:1140 #, fuzzy, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Su pedido está pendiente de pago: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Su pedido está pendiente de pago: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "O seu ticket está listo para descargar: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "O seu ticket está listo para descargar: {code}" #: pretix/base/services/orders.py:1252 #, fuzzy, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Su pedido ha sido modificado: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Su pedido ha sido modificado: {code}" #: pretix/base/services/orders.py:1264 #, fuzzy @@ -30842,8 +30842,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Os teus pedidos de {}" +msgid "Your orders for {event}" +msgstr "Os teus pedidos de {event}" #: pretix/presale/views/user.py:91 #, fuzzy diff --git a/src/pretix/locale/he/LC_MESSAGES/django.po b/src/pretix/locale/he/LC_MESSAGES/django.po index 7e79f18dcf..ce159fb416 100644 --- a/src/pretix/locale/he/LC_MESSAGES/django.po +++ b/src/pretix/locale/he/LC_MESSAGES/django.po @@ -25459,7 +25459,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/hu/LC_MESSAGES/django.po b/src/pretix/locale/hu/LC_MESSAGES/django.po index 23713ba7b6..bbbec0ba00 100644 --- a/src/pretix/locale/hu/LC_MESSAGES/django.po +++ b/src/pretix/locale/hu/LC_MESSAGES/django.po @@ -25916,8 +25916,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "{} rendeléseid" +msgid "Your orders for {event}" +msgstr "{event} rendeléseid" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/it/LC_MESSAGES/django.po b/src/pretix/locale/it/LC_MESSAGES/django.po index c0d2f2f70d..a1adc4b22a 100644 --- a/src/pretix/locale/it/LC_MESSAGES/django.po +++ b/src/pretix/locale/it/LC_MESSAGES/django.po @@ -4255,8 +4255,8 @@ msgstr "" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Pagamento ricevuto per il tuo ordine: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Pagamento ricevuto per il tuo ordine: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6503,8 +6503,8 @@ msgstr "" #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Ordine approvato e confermato: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Ordine approvato e confermato: {code}" #: pretix/base/services/orders.py:330 #, python-format @@ -6562,13 +6562,13 @@ msgstr "" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Il tuo ordine è in attesa di pagamento: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Il tuo ordine è in attesa di pagamento: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Il tuo biglietto è pronto per il download: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Il tuo biglietto è pronto per il download: {code}" #: pretix/base/services/orders.py:1252 #, python-format @@ -27003,7 +27003,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/ja/LC_MESSAGES/django.po b/src/pretix/locale/ja/LC_MESSAGES/django.po index 9d685d5c7d..966c09ad55 100644 --- a/src/pretix/locale/ja/LC_MESSAGES/django.po +++ b/src/pretix/locale/ja/LC_MESSAGES/django.po @@ -25549,7 +25549,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/lv/LC_MESSAGES/django.po b/src/pretix/locale/lv/LC_MESSAGES/django.po index 9522b815b3..897aadcf0b 100644 --- a/src/pretix/locale/lv/LC_MESSAGES/django.po +++ b/src/pretix/locale/lv/LC_MESSAGES/django.po @@ -4342,13 +4342,13 @@ msgstr "Informācija par maksājumu" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Pasākuma reģistrācija apstiprināta: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Pasākuma reģistrācija apstiprināta: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Maksājums par pasūtījumu saņemts: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Maksājums par pasūtījumu saņemts: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6701,18 +6701,18 @@ msgstr "Šis pasūtījums vēl nav apstiprināts." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Pasūtījums pieņemts un apstiprināts: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Pasūtījums pieņemts un apstiprināts: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Pasūtījums pieņemts un gaida apmaksu: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Pasūtījums pieņemts un gaida apmaksu: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Pasūtījums noraidīts: %(code)s" +msgid "Order denied: {code}" +msgstr "Pasūtījums noraidīts: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6735,8 +6735,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Pasūtījums atcelts: %(code)s" +msgid "Order canceled: {code}" +msgstr "Pasūtījums atcelts: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6761,23 +6761,23 @@ msgstr "Jūsu pasākuma reģistrācija: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Jūsu pasūtījuma termiņš drīz beigsies: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Jūsu pasūtījuma termiņš drīz beigsies: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Jūsu pasūtījums gaida apmaksu: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Jūsu pasūtījums gaida apmaksu: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Jūsu biļete ir gatava lejupielādei: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Jūsu biļete ir gatava lejupielādei: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Jūsu pasūtījums ir mainīts: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Jūsu pasūtījums ir mainīts: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -26633,8 +26633,8 @@ msgstr "" "pārbaudiet, vai jūs izmantojāt pareizo e-pasta adresi." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Jūsu pasūtījumi par {}" +msgid "Your orders for {event}" +msgstr "Jūsu pasūtījumi par {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/nb_NO/LC_MESSAGES/django.po b/src/pretix/locale/nb_NO/LC_MESSAGES/django.po index 86258d5743..accdda6512 100644 --- a/src/pretix/locale/nb_NO/LC_MESSAGES/django.po +++ b/src/pretix/locale/nb_NO/LC_MESSAGES/django.po @@ -25772,7 +25772,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/nl/LC_MESSAGES/django.po b/src/pretix/locale/nl/LC_MESSAGES/django.po index 117d95a0e7..5a14f5cc76 100644 --- a/src/pretix/locale/nl/LC_MESSAGES/django.po +++ b/src/pretix/locale/nl/LC_MESSAGES/django.po @@ -4457,13 +4457,13 @@ msgstr "Betalingsinformatie" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Aanmelding voor evenement bevestigd: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Aanmelding voor evenement bevestigd: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Betaling ontvangen voor uw bestelling: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Betaling ontvangen voor uw bestelling: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6912,18 +6912,18 @@ msgstr "Deze bestelling hoeft niet goedgekeurd te worden." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Bestelling goedgekeurd en bevestigd: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Bestelling goedgekeurd en bevestigd: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Bestelling goedgekeurd en in afwachting van betaling: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Bestelling goedgekeurd en in afwachting van betaling: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Bestelling geweigerd: %(code)s" +msgid "Order denied: {code}" +msgstr "Bestelling geweigerd: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6948,8 +6948,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Bestelling geannuleerd: %(code)s" +msgid "Order canceled: {code}" +msgstr "Bestelling geannuleerd: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6975,23 +6975,23 @@ msgstr "Uw aanmelding: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Uw bestelling staat op het punt om te verlopen: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Uw bestelling staat op het punt om te verlopen: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Uw bestelling wacht op betaling: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Uw bestelling wacht op betaling: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Uw ticket staat klaar om te downloaden: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Uw ticket staat klaar om te downloaden: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Uw bestelling is aangepast: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Uw bestelling is aangepast: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -28888,8 +28888,8 @@ msgstr "" "mailadres heeft ingevuld." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Uw bestellingen voor {}" +msgid "Your orders for {event}" +msgstr "Uw bestellingen voor {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/nl_BE/LC_MESSAGES/django.po b/src/pretix/locale/nl_BE/LC_MESSAGES/django.po index e09e23e3fb..e4cdb65568 100644 --- a/src/pretix/locale/nl_BE/LC_MESSAGES/django.po +++ b/src/pretix/locale/nl_BE/LC_MESSAGES/django.po @@ -25447,7 +25447,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/nl_Informal/LC_MESSAGES/django.po b/src/pretix/locale/nl_Informal/LC_MESSAGES/django.po index 4f0e4854a2..e9ecf6fa1d 100644 --- a/src/pretix/locale/nl_Informal/LC_MESSAGES/django.po +++ b/src/pretix/locale/nl_Informal/LC_MESSAGES/django.po @@ -4457,13 +4457,13 @@ msgstr "Betalingsinformatie" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Aanmelding voor evenement bevestigd: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Aanmelding voor evenement bevestigd: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Betaling ontvangen voor je bestelling: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Betaling ontvangen voor je bestelling: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6915,18 +6915,18 @@ msgstr "Deze bestelling wacht niet op goedkeuring." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Bestelling goedgekeurd en bevestigd: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Bestelling goedgekeurd en bevestigd: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Bestelling goedgekeurd en in afwachting van betaling: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Bestelling goedgekeurd en in afwachting van betaling: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Bestelling geweigerd: %(code)s" +msgid "Order denied: {code}" +msgstr "Bestelling geweigerd: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6951,8 +6951,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Bestelling geannuleerd: %(code)s" +msgid "Order canceled: {code}" +msgstr "Bestelling geannuleerd: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6978,23 +6978,23 @@ msgstr "Je aanmelding: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Je bestelling verloopt bijna: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Je bestelling verloopt bijna: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Je bestelling wacht op betaling: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Je bestelling wacht op betaling: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Je kaartje staat klaar om te downloaden: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Je kaartje staat klaar om te downloaden: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Je bestelling is aangepast: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Je bestelling is aangepast: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -29250,8 +29250,8 @@ msgstr "" "juiste e-mailadres hebt ingevuld." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Je bestellingen voor {}" +msgid "Your orders for {event}" +msgstr "Je bestellingen voor {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/pl/LC_MESSAGES/django.po b/src/pretix/locale/pl/LC_MESSAGES/django.po index f1dca76e8c..f243057f08 100644 --- a/src/pretix/locale/pl/LC_MESSAGES/django.po +++ b/src/pretix/locale/pl/LC_MESSAGES/django.po @@ -4461,8 +4461,8 @@ msgstr "" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Płatność otrzymana dla zamówienia: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Płatność otrzymana dla zamówienia: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -27052,7 +27052,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/pl_Informal/LC_MESSAGES/django.po b/src/pretix/locale/pl_Informal/LC_MESSAGES/django.po index 16191a0d3a..4fdf23b333 100644 --- a/src/pretix/locale/pl_Informal/LC_MESSAGES/django.po +++ b/src/pretix/locale/pl_Informal/LC_MESSAGES/django.po @@ -25464,7 +25464,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/pt/LC_MESSAGES/django.po b/src/pretix/locale/pt/LC_MESSAGES/django.po index 22cf364fe2..b7fcf398ce 100644 --- a/src/pretix/locale/pt/LC_MESSAGES/django.po +++ b/src/pretix/locale/pt/LC_MESSAGES/django.po @@ -25695,7 +25695,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/pt_BR/LC_MESSAGES/django.po b/src/pretix/locale/pt_BR/LC_MESSAGES/django.po index 74f31111cb..090cbd2828 100644 --- a/src/pretix/locale/pt_BR/LC_MESSAGES/django.po +++ b/src/pretix/locale/pt_BR/LC_MESSAGES/django.po @@ -4548,8 +4548,8 @@ msgstr "Código do pedido" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Pagamento recebido pelo seu pedido: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Pagamento recebido pelo seu pedido: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -27833,8 +27833,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Suas ordens para {}" +msgid "Your orders for {event}" +msgstr "Suas ordens para {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/pt_PT/LC_MESSAGES/django.po b/src/pretix/locale/pt_PT/LC_MESSAGES/django.po index 72fd54a762..07379f87c3 100644 --- a/src/pretix/locale/pt_PT/LC_MESSAGES/django.po +++ b/src/pretix/locale/pt_PT/LC_MESSAGES/django.po @@ -4531,13 +4531,13 @@ msgstr "Informação de pagamento" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Registro de Evento confirmado: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Registro de Evento confirmado: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Pagamento recebido para a sua encomenda: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Pagamento recebido para a sua encomenda: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -7013,18 +7013,18 @@ msgstr "Esta encomenda não está pendente de aprovação." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Encomenda aprovada e confirmada: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Encomenda aprovada e confirmada: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Encomenda aprovada e aguardando pagamento: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Encomenda aprovada e aguardando pagamento: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Encomenda negada: %(code)s" +msgid "Order denied: {code}" +msgstr "Encomenda negada: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -7049,8 +7049,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Encomenda cancelada: %(code)s" +msgid "Order canceled: {code}" +msgstr "Encomenda cancelada: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -7074,23 +7074,23 @@ msgstr "O seu registo no evento: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "A sua encomenda está prestes a expirar: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "A sua encomenda está prestes a expirar: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "A sua encomenda está pendente de pagamento: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "A sua encomenda está pendente de pagamento: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "O seu bilhete está pronto para download: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "O seu bilhete está pronto para download: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "A sua encomenda foi alterada: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "A sua encomenda foi alterada: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -29319,8 +29319,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "As suas encomendas para {}" +msgid "Your orders for {event}" +msgstr "As suas encomendas para {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/ro/LC_MESSAGES/django.po b/src/pretix/locale/ro/LC_MESSAGES/django.po index eeacaeb686..532c06728d 100644 --- a/src/pretix/locale/ro/LC_MESSAGES/django.po +++ b/src/pretix/locale/ro/LC_MESSAGES/django.po @@ -4456,13 +4456,13 @@ msgstr "Informații despre plată" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Înregistrarea la eveniment a fost confirmată: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Înregistrarea la eveniment a fost confirmată: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Plata primită pentru comanda dvs.: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Plata primită pentru comanda dvs.: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6902,18 +6902,18 @@ msgstr "Această comandă nu este în curs de aprobare." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Comandă aprobată și confirmată: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Comandă aprobată și confirmată: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Comandă aprobată și în așteptarea plății: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Comandă aprobată și în așteptarea plății: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Comanda a fost respinsă: %(code)s" +msgid "Order denied: {code}" +msgstr "Comanda a fost respinsă: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6938,8 +6938,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Comandă anulată: %(code)s" +msgid "Order canceled: {code}" +msgstr "Comandă anulată: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6964,23 +6964,23 @@ msgstr "Înregistrarea la eveniment: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Comanda dumneavoastră este pe cale să expire: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Comanda dumneavoastră este pe cale să expire: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Comanda dumneavoastră este în așteptarea plății: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Comanda dumneavoastră este în așteptarea plății: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Biletul dvs. este gata de descărcare: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Biletul dvs. este gata de descărcare: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Comanda dvs. a fost modificată: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Comanda dvs. a fost modificată: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -28916,8 +28916,8 @@ msgstr "" "mail corectă." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Comenzile dumneavoastră pentru {}" +msgid "Your orders for {event}" +msgstr "Comenzile dumneavoastră pentru {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/ru/LC_MESSAGES/django.po b/src/pretix/locale/ru/LC_MESSAGES/django.po index d03237f882..09f53f03c5 100644 --- a/src/pretix/locale/ru/LC_MESSAGES/django.po +++ b/src/pretix/locale/ru/LC_MESSAGES/django.po @@ -4536,13 +4536,13 @@ msgstr "Информация о платеже" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Регистрация мероприятия подтверждена: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Регистрация мероприятия подтверждена: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Получена оплата за ваш заказ: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Получена оплата за ваш заказ: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -7055,18 +7055,18 @@ msgstr "Этот заказ не ожидает утверждения." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Заказ утверждён и подтверждён: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Заказ утверждён и подтверждён: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Заказ утверждён и ожидает оплату: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Заказ утверждён и ожидает оплату: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Заказ отклонён: %(code)s" +msgid "Order denied: {code}" +msgstr "Заказ отклонён: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -7089,8 +7089,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Заказ отменён: %(code)s" +msgid "Order canceled: {code}" +msgstr "Заказ отменён: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -7115,23 +7115,23 @@ msgstr "Регистрация вашего мероприятия: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Ваш заказ истекает: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Ваш заказ истекает: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Оплата вашего заказа не завершена: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Оплата вашего заказа не завершена: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Ваш билет готов к скачиванию: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Ваш билет готов к скачиванию: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Ваш заказ был изменён: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Ваш заказ был изменён: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -27805,8 +27805,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Ваши заказы на {}" +msgid "Your orders for {event}" +msgstr "Ваши заказы на {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/si/LC_MESSAGES/django.po b/src/pretix/locale/si/LC_MESSAGES/django.po index 32063c827f..3e1e20f4bf 100644 --- a/src/pretix/locale/si/LC_MESSAGES/django.po +++ b/src/pretix/locale/si/LC_MESSAGES/django.po @@ -25491,7 +25491,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/sl/LC_MESSAGES/django.po b/src/pretix/locale/sl/LC_MESSAGES/django.po index bc8ac45703..6d80962b51 100644 --- a/src/pretix/locale/sl/LC_MESSAGES/django.po +++ b/src/pretix/locale/sl/LC_MESSAGES/django.po @@ -4445,13 +4445,13 @@ msgstr "Podatki o plačilu" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Registracija na dogodek potrjena: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Registracija na dogodek potrjena: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Plačilo naročila prejeto: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Plačilo naročila prejeto: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6882,18 +6882,18 @@ msgstr "To naročilo ne čaka na odobritev." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Naročilo odobreno in potrjeno: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Naročilo odobreno in potrjeno: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Naročilo odobreno in čaka na plačilo: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Naročilo odobreno in čaka na plačilo: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Naročilo zavrnjeno: %(code)s" +msgid "Order denied: {code}" +msgstr "Naročilo zavrnjeno: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6917,8 +6917,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Naročilo preklicano: %(code)s" +msgid "Order canceled: {code}" +msgstr "Naročilo preklicano: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6943,23 +6943,23 @@ msgstr "Registracija vašega dogodka: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Vaše naročilo bo kmalu poteklo: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Vaše naročilo bo kmalu poteklo: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Naročilo čaka na plačilo: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Naročilo čaka na plačilo: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Vaša vstopnica je pripravljena za prenos: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Vaša vstopnica je pripravljena za prenos: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Vaše naročilo je spremenjeno: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Vaše naročilo je spremenjeno: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -27282,7 +27282,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/sv/LC_MESSAGES/django.po b/src/pretix/locale/sv/LC_MESSAGES/django.po index 9d7bfd729b..a06dc31209 100644 --- a/src/pretix/locale/sv/LC_MESSAGES/django.po +++ b/src/pretix/locale/sv/LC_MESSAGES/django.po @@ -4470,13 +4470,13 @@ msgstr "Betalningsinformation" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Evenemangsregistrering bekräftad: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Evenemangsregistrering bekräftad: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Betalning mottagen för din beställning: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Betalning mottagen för din beställning: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -27309,7 +27309,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/tr/LC_MESSAGES/django.po b/src/pretix/locale/tr/LC_MESSAGES/django.po index 518c2f5ae8..2efe34e8c4 100644 --- a/src/pretix/locale/tr/LC_MESSAGES/django.po +++ b/src/pretix/locale/tr/LC_MESSAGES/django.po @@ -4739,13 +4739,13 @@ msgstr "Ödeme bilgileri" #: pretix/base/models/orders.py:1742 #, fuzzy, python-format #| msgid "Order approved and confirmed: %(code)s" -msgid "Event registration confirmed: %(code)s" -msgstr "Sipariş onaylandı ve onaylandı: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Sipariş onaylandı ve onaylandı: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Siparişiniz için ödeme alındı: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Siparişiniz için ödeme alındı: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -7347,18 +7347,18 @@ msgstr "Bu sipariş onay bekliyor değil." #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Sipariş onaylandı ve onaylandı: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Sipariş onaylandı ve onaylandı: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Sipariş onaylandı ve ödeme bekleniyor: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Sipariş onaylandı ve ödeme bekleniyor: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Sipariş reddedildi: %(code)s" +msgid "Order denied: {code}" +msgstr "Sipariş reddedildi: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -7379,8 +7379,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Sipariş iptal edildi: %(code)s" +msgid "Order canceled: {code}" +msgstr "Sipariş iptal edildi: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -7402,23 +7402,23 @@ msgstr "Siparişiniz: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Siparişinizin süresi dolmak üzere: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Siparişinizin süresi dolmak üzere: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Siparişiniz ödemeyi bekliyor: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Siparişiniz ödemeyi bekliyor: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Biletin indirilmeye hazır: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Biletin indirilmeye hazır: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Siparişiniz değiştirildi: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Siparişiniz değiştirildi: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -30466,8 +30466,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "{} İçin siparişleriniz" +msgid "Your orders for {event}" +msgstr "{event} İçin siparişleriniz" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/uk/LC_MESSAGES/django.po b/src/pretix/locale/uk/LC_MESSAGES/django.po index c3bf49b02a..edcefa9075 100644 --- a/src/pretix/locale/uk/LC_MESSAGES/django.po +++ b/src/pretix/locale/uk/LC_MESSAGES/django.po @@ -4424,13 +4424,13 @@ msgstr "Інформація про оплату" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "Реєстрацію на подію підтверджено: %(code)s" +msgid "Event registration confirmed: {code}" +msgstr "Реєстрацію на подію підтверджено: {code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "Отримано платіж за ваше замовлення: %(code)s" +msgid "Payment received for your order: {code}" +msgstr "Отримано платіж за ваше замовлення: {code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6846,18 +6846,18 @@ msgstr "Це замовлення не очікує на затвердженн #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "Замовлення затверджено та підтверджено: %(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "Замовлення затверджено та підтверджено: {code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "Замовлення затверджено та очікує на оплату: %(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "Замовлення затверджено та очікує на оплату: {code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "Замовлення відхилено: %(code)s" +msgid "Order denied: {code}" +msgstr "Замовлення відхилено: {code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6882,8 +6882,8 @@ msgstr "" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "Замовлення скасовано: %(code)s" +msgid "Order canceled: {code}" +msgstr "Замовлення скасовано: {code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6908,23 +6908,23 @@ msgstr "Реєстрація вашого заходу: {code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "Термін дії вашого замовлення закінчується: %(code)s" +msgid "Your order is about to expire: {code}" +msgstr "Термін дії вашого замовлення закінчується: {code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "Ваше замовлення очікує на оплату: %(code)s" +msgid "Your order is pending payment: {code}" +msgstr "Ваше замовлення очікує на оплату: {code}" #: pretix/base/services/orders.py:1214 #, python-format -msgid "Your ticket is ready for download: %(code)s" -msgstr "Ваш квиток готовий до завантаження: %(code)s" +msgid "Your ticket is ready for download: {code}" +msgstr "Ваш квиток готовий до завантаження: {code}" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "Ваше замовлення було змінено: %(code)s" +msgid "Your order has been changed: {code}" +msgstr "Ваше замовлення було змінено: {code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -27860,8 +27860,8 @@ msgstr "" "перевірте правильність електронної адреси, яку ви вказали." #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "Ваші замовлення для {}" +msgid "Your orders for {event}" +msgstr "Ваші замовлення для {event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/locale/vi/LC_MESSAGES/django.po b/src/pretix/locale/vi/LC_MESSAGES/django.po index ce1baa809e..e3021516e8 100644 --- a/src/pretix/locale/vi/LC_MESSAGES/django.po +++ b/src/pretix/locale/vi/LC_MESSAGES/django.po @@ -25460,7 +25460,7 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" +msgid "Your orders for {event}" msgstr "" #: pretix/presale/views/user.py:91 diff --git a/src/pretix/locale/zh_Hans/LC_MESSAGES/django.po b/src/pretix/locale/zh_Hans/LC_MESSAGES/django.po index c3940d6ed4..b1f9b0b1a1 100644 --- a/src/pretix/locale/zh_Hans/LC_MESSAGES/django.po +++ b/src/pretix/locale/zh_Hans/LC_MESSAGES/django.po @@ -4461,13 +4461,13 @@ msgstr "支付信息" #: pretix/base/models/orders.py:1742 #, python-format -msgid "Event registration confirmed: %(code)s" -msgstr "活动注册已确认：%(code)s" +msgid "Event registration confirmed: {code}" +msgstr "活动注册已确认：{code}" #: pretix/base/models/orders.py:1760 #, python-format -msgid "Payment received for your order: %(code)s" -msgstr "已收到您的订单付款：%(code)s" +msgid "Payment received for your order: {code}" +msgstr "已收到您的订单付款：{code}" #: pretix/base/models/orders.py:1870 msgctxt "refund_state" @@ -6895,18 +6895,18 @@ msgstr "此订单未待批准。" #: pretix/base/services/orders.py:327 #, python-format -msgid "Order approved and confirmed: %(code)s" -msgstr "订单已批准并确认：%(code)s" +msgid "Order approved and confirmed: {code}" +msgstr "订单已批准并确认：{code}" #: pretix/base/services/orders.py:330 #, python-format -msgid "Order approved and awaiting payment: %(code)s" -msgstr "订单已批准并等待付款：%(code)s" +msgid "Order approved and awaiting payment: {code}" +msgstr "订单已批准并等待付款：{code}" #: pretix/base/services/orders.py:378 #, python-format -msgid "Order denied: %(code)s" -msgstr "订单被拒绝：%(code)s" +msgid "Order denied: {code}" +msgstr "订单被拒绝：{code}" #: pretix/base/services/orders.py:413 pretix/presale/views/order.py:857 #: pretix/presale/views/order.py:906 @@ -6927,8 +6927,8 @@ msgstr "取消费用不能高于此订单的付款额度。" #: pretix/base/services/orders.py:497 #, python-format -msgid "Order canceled: %(code)s" -msgstr "订单已取消：%(code)s" +msgid "Order canceled: {code}" +msgstr "订单已取消：{code}" #: pretix/base/services/orders.py:915 msgid "" @@ -6951,13 +6951,13 @@ msgstr "您的活动注册：{code}" #: pretix/base/services/orders.py:1138 #, python-format -msgid "Your order is about to expire: %(code)s" -msgstr "您的订单即将到期：%(code)s" +msgid "Your order is about to expire: {code}" +msgstr "您的订单即将到期：{code}" #: pretix/base/services/orders.py:1140 #, python-format -msgid "Your order is pending payment: %(code)s" -msgstr "您的订单待付款：%(code)s" +msgid "Your order is pending payment: {code}" +msgstr "您的订单待付款：{code}" #: pretix/base/services/orders.py:1214 #, python-format @@ -6966,8 +6966,8 @@ msgstr "您的票已准备好下载：%(code)s" #: pretix/base/services/orders.py:1252 #, python-format -msgid "Your order has been changed: %(code)s" -msgstr "您的订单已更改：%(code)s" +msgid "Your order has been changed: {code}" +msgstr "您的订单已更改：{code}" #: pretix/base/services/orders.py:1264 msgid "You need to select a variation of the product." @@ -28965,8 +28965,8 @@ msgid "" msgstr "" #: pretix/presale/views/user.py:83 -msgid "Your orders for {}" -msgstr "您的订单{}" +msgid "Your orders for {event}" +msgstr "您的订单{event}" #: pretix/presale/views/user.py:91 msgid "We have trouble sending emails right now, please check back later." diff --git a/src/pretix/presale/views/customer.py b/src/pretix/presale/views/customer.py index 1d278ee69d..a0cc8e6c29 100644 --- a/src/pretix/presale/views/customer.py +++ b/src/pretix/presale/views/customer.py @@ -311,7 +311,7 @@ class ResetPasswordView(FormView): 'presale:organizer.customer.recoverpw') + '?id=' + customer.identifier + '&token=' + token mail( customer.email, - _('Set a new password for your account at {organizer}').format(organizer=self.request.organizer.name), + self.request.organizer.settings.mail_subject_customer_reset, self.request.organizer.settings.mail_text_customer_reset, ctx, locale=customer.locale, @@ -504,7 +504,7 @@ class ChangeInformationView(CustomerRequiredMixin, FormView): }, salt='pretix.presale.views.customer.ChangeInformationView') mail( new_email, - _('Confirm email address for your account at {organizer}').format(organizer=self.request.organizer.name), + self.request.organizer.settings.mail_subject_customer_email_change, self.request.organizer.settings.mail_text_customer_email_change, ctx, locale=form.instance.locale, diff --git a/src/pretix/presale/views/user.py b/src/pretix/presale/views/user.py index 0b6d9f83a7..3543bf4205 100644 --- a/src/pretix/presale/views/user.py +++ b/src/pretix/presale/views/user.py @@ -80,7 +80,7 @@ class ResendLinkView(EventViewMixin, TemplateView): if not orders: user = INVALID_ADDRESS - subject = _('Your orders for {}').format(self.request.event) + subject = self.request.event.settings.mail_subject_resend_all_links template = self.request.event.settings.mail_text_resend_all_links context = get_email_context(event=self.request.event, orders=orders) try: diff --git a/src/pretix/static/pretixcontrol/js/ui/mail.js b/src/pretix/static/pretixcontrol/js/ui/mail.js index 12f0e745dc..60f3e5b049 100644 --- a/src/pretix/static/pretixcontrol/js/ui/mail.js +++ b/src/pretix/static/pretixcontrol/js/ui/mail.js @@ -45,7 +45,7 @@ $(function () { var previewUrl = $(parentForm).attr('mail-preview-url'); var token = $(parentForm).find('input[name=csrfmiddlewaretoken]').val(); var dataString = 'item=' + itemName + '&csrfmiddlewaretoken=' + token; - $('#' + itemName + '_edit textarea').each(function () { + $('#' + itemName + '_edit textarea, #' + itemName + '_edit input').each(function () { dataString += '&' + $(this).serialize(); });