diff --git a/src/pretix/plugins/sendmail/forms.py b/src/pretix/plugins/sendmail/forms.py index a5cf87320..a896c3d79 100644 --- a/src/pretix/plugins/sendmail/forms.py +++ b/src/pretix/plugins/sendmail/forms.py @@ -384,8 +384,8 @@ class RuleForm(FormPlaceholderMixin, I18nModelForm): ] ) - self._set_field_placeholders('subject', ['event', 'order', 'position_or_address']) - self._set_field_placeholders('template', ['event', 'order', 'position_or_address'], rich=True) + self._set_field_placeholders('subject', ['event', 'order', 'event_or_subevent', 'position_or_address']) + self._set_field_placeholders('template', ['event', 'order', 'event_or_subevent', 'position_or_address'], rich=True) choices = [ (Order.STATUS_PAID, _('Paid (or canceled with paid fee)')), diff --git a/src/pretix/plugins/sendmail/views.py b/src/pretix/plugins/sendmail/views.py index a78edbb9c..2f5540f23 100644 --- a/src/pretix/plugins/sendmail/views.py +++ b/src/pretix/plugins/sendmail/views.py @@ -657,7 +657,7 @@ class UpdateRule(EventPermissionRequiredMixin, UpdateView): for lang in self.request.event.settings.locales: with language(lang, self.request.event.settings.region): - placeholders = get_sample_context(self.request.event, ['event', 'order', 'position_or_address']) + placeholders = get_sample_context(self.request.event, ['event', 'order', 'event_or_subevent', 'position_or_address']) subject = bleach.clean(self.object.subject.localize(lang), tags=set()) preview_subject = prefix_subject(self.request.event, format_map(subject, placeholders), highlight=True) template = self.object.template.localize(lang)