From 758179f12f3c75afd248916314a9ddf18e6d1685 Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Fri, 18 Feb 2022 08:02:51 +0100 Subject: [PATCH] Add name_for_salutation to customer email placeholders (#2474) --- src/pretix/base/models/customers.py | 6 ++++++ src/pretix/control/forms/organizer.py | 1 + 2 files changed, 7 insertions(+) diff --git a/src/pretix/base/models/customers.py b/src/pretix/base/models/customers.py index 4ca3791dbf..6952114ad3 100644 --- a/src/pretix/base/models/customers.py +++ b/src/pretix/base/models/customers.py @@ -182,6 +182,12 @@ class Customer(LoggedModel): if f == 'full_name': continue ctx['name_%s' % f] = get_name_parts_localized(self.name_parts, f) + + if "concatenation_for_salutation" in name_scheme: + ctx['name_for_salutation'] = name_scheme["concatenation_for_salutation"](self.name_parts) + else: + ctx['name_for_salutation'] = name_scheme["concatenation"](self.name_parts) + return ctx @property diff --git a/src/pretix/control/forms/organizer.py b/src/pretix/control/forms/organizer.py index 7631c64bc1..09965764b0 100644 --- a/src/pretix/control/forms/organizer.py +++ b/src/pretix/control/forms/organizer.py @@ -422,6 +422,7 @@ class MailSettingsForm(SettingsForm): if f == 'full_name': continue placeholders['name_%s' % f] = name_scheme['sample'][f] + placeholders['name_for_salutation'] = _("Mr Doe") return placeholders def _set_field_placeholders(self, fn, base_parameters):