From a25bca7471b6e5f3a213ffff39ff1044dc368bbd Mon Sep 17 00:00:00 2001 From: Richard Schreiber Date: Wed, 25 Feb 2026 13:19:53 +0100 Subject: [PATCH] Fix static instance name in emails (Z#23224360) (#5914) --- src/pretix/api/serializers/organizer.py | 3 ++- src/pretix/base/models/auth.py | 5 ++++- src/pretix/base/services/shredder.py | 1 + .../base/templates/pretixbase/email/shred_completed.txt | 2 +- .../templates/pretixcontrol/email/confirmation_code.txt | 2 +- src/pretix/control/templates/pretixcontrol/email/forgot.txt | 4 ++-- .../control/templates/pretixcontrol/email/invitation.txt | 4 ++-- .../templates/pretixcontrol/email/security_notice.txt | 4 ++-- src/pretix/control/views/organizer.py | 3 ++- 9 files changed, 17 insertions(+), 11 deletions(-) diff --git a/src/pretix/api/serializers/organizer.py b/src/pretix/api/serializers/organizer.py index 6d8f6743b9..ab12e7b942 100644 --- a/src/pretix/api/serializers/organizer.py +++ b/src/pretix/api/serializers/organizer.py @@ -365,9 +365,10 @@ class TeamInviteSerializer(serializers.ModelSerializer): def _send_invite(self, instance): mail( instance.email, - _('pretix account invitation'), + _('Account invitation'), 'pretixcontrol/email/invitation.txt', { + 'instance': settings.PRETIX_INSTANCE_NAME, 'user': self, 'organizer': self.context['organizer'].name, 'team': instance.team.name, diff --git a/src/pretix/base/models/auth.py b/src/pretix/base/models/auth.py index 0d2ba97a27..d3987d566b 100644 --- a/src/pretix/base/models/auth.py +++ b/src/pretix/base/models/auth.py @@ -346,7 +346,8 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin): { 'user': self, 'messages': msg, - 'url': build_absolute_uri('control:user.settings') + 'url': build_absolute_uri('control:user.settings'), + 'instance': settings.PRETIX_INSTANCE_NAME, }, event=None, user=self, @@ -391,6 +392,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin): 'user': self, 'reason': msg, 'code': code, + 'instance': settings.PRETIX_INSTANCE_NAME, }, event=None, user=self, @@ -430,6 +432,7 @@ class User(AbstractBaseUser, PermissionsMixin, LoggingMixin): mail( self.email, _('Password recovery'), 'pretixcontrol/email/forgot.txt', { + 'instance': settings.PRETIX_INSTANCE_NAME, 'user': self, 'url': (build_absolute_uri('control:auth.forgot.recover') + '?id=%d&token=%s' % (self.id, default_token_generator.make_token(self))) diff --git a/src/pretix/base/services/shredder.py b/src/pretix/base/services/shredder.py index 6211ad4a85..43d88b3622 100644 --- a/src/pretix/base/services/shredder.py +++ b/src/pretix/base/services/shredder.py @@ -176,6 +176,7 @@ def shred(self, event: Event, fileid: str, confirm_code: str, user: int=None, lo _('Data shredding completed'), 'pretixbase/email/shred_completed.txt', { + 'instance': settings.PRETIX_INSTANCE_NAME, 'user': user, 'organizer': event.organizer.name, 'event': str(event.name), diff --git a/src/pretix/base/templates/pretixbase/email/shred_completed.txt b/src/pretix/base/templates/pretixbase/email/shred_completed.txt index 726612c147..4bde98e16e 100644 --- a/src/pretix/base/templates/pretixbase/email/shred_completed.txt +++ b/src/pretix/base/templates/pretixbase/email/shred_completed.txt @@ -13,5 +13,5 @@ Start time: {{ start_time }} (new data added after this time might not have been Best regards, -Your pretix team +Your {{ instance }} team {% endblocktrans %} diff --git a/src/pretix/control/templates/pretixcontrol/email/confirmation_code.txt b/src/pretix/control/templates/pretixcontrol/email/confirmation_code.txt index 5ac75436dd..27966e6d9b 100644 --- a/src/pretix/control/templates/pretixcontrol/email/confirmation_code.txt +++ b/src/pretix/control/templates/pretixcontrol/email/confirmation_code.txt @@ -9,5 +9,5 @@ Please do never give this code to another person. Our support team will never as If this code was not requested by you, please contact us immediately. Best regards, -Your pretix team +Your {{ instance }} team {% endblocktrans %} diff --git a/src/pretix/control/templates/pretixcontrol/email/forgot.txt b/src/pretix/control/templates/pretixcontrol/email/forgot.txt index c777e33e81..a9292eb521 100644 --- a/src/pretix/control/templates/pretixcontrol/email/forgot.txt +++ b/src/pretix/control/templates/pretixcontrol/email/forgot.txt @@ -5,5 +5,5 @@ you requested a new password. Please go to the following page to reset your pass {{ url }} Best regards, -Your pretix team -{% endblocktrans %} \ No newline at end of file +Your {{ instance }} team +{% endblocktrans %} diff --git a/src/pretix/control/templates/pretixcontrol/email/invitation.txt b/src/pretix/control/templates/pretixcontrol/email/invitation.txt index 9742db4fa4..7b3b6c1608 100644 --- a/src/pretix/control/templates/pretixcontrol/email/invitation.txt +++ b/src/pretix/control/templates/pretixcontrol/email/invitation.txt @@ -1,6 +1,6 @@ {% load i18n %}{% blocktrans with url=url|safe %}Hello, -you have been invited to a team on pretix, a platform to perform event +you have been invited to a team on {{ instance }}, a platform to perform event ticket sales. Organizer: {{ organizer }} @@ -13,5 +13,5 @@ If you do not want to join, you can safely ignore or delete this email. Best regards, -Your pretix team +Your {{ instance }} team {% endblocktrans %} diff --git a/src/pretix/control/templates/pretixcontrol/email/security_notice.txt b/src/pretix/control/templates/pretixcontrol/email/security_notice.txt index 3eceb36083..a8f6531f3e 100644 --- a/src/pretix/control/templates/pretixcontrol/email/security_notice.txt +++ b/src/pretix/control/templates/pretixcontrol/email/security_notice.txt @@ -1,6 +1,6 @@ {% load i18n %}{% blocktrans with url=url|safe messages=messages|safe %}Hello, -this is to inform you that the account information of your pretix account has been +this is to inform you that the account information of your {{ instance }} account has been changed. In particular, the following changes have been performed: {{ messages }} @@ -12,5 +12,5 @@ You can review and change your account settings here: {{ url }} Best regards, -Your pretix team +Your {{ instance }} team {% endblocktrans %} diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py index 146ef96a48..94c77812c4 100644 --- a/src/pretix/control/views/organizer.py +++ b/src/pretix/control/views/organizer.py @@ -1039,9 +1039,10 @@ class TeamMemberView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin, def _send_invite(self, instance): mail( instance.email, - _('pretix account invitation'), + _('Account invitation'), 'pretixcontrol/email/invitation.txt', { + 'instance': settings.PRETIX_INSTANCE_NAME, 'user': self, 'organizer': self.request.organizer.name, 'team': instance.team.name,