mirror of
https://github.com/pretix/pretix.git
synced 2026-05-16 17:03:58 +00:00
Merge pull request 'upstream/2026.4.1' (#16) from upstream/2026.4.1 into master
Reviewed-on: CGM_Public/pretix_cgo#16
This commit is contained in:
@@ -19,4 +19,4 @@
|
||||
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
|
||||
# <https://www.gnu.org/licenses/>.
|
||||
#
|
||||
__version__ = "2026.4.0"
|
||||
__version__ = "2026.4.1"
|
||||
|
||||
@@ -34309,7 +34309,7 @@ msgstr "MOTO"
|
||||
#: pretix/plugins/stripe/templates/pretixplugins/stripe/control.html:64
|
||||
#: pretix/plugins/stripe/templates/pretixplugins/stripe/control.html:67
|
||||
msgid "Payer name"
|
||||
msgstr "Name des Zahlenden"
|
||||
msgstr "Name des Zahlers"
|
||||
|
||||
#: pretix/plugins/stripe/templates/pretixplugins/stripe/control.html:91
|
||||
msgid "Payment receipt"
|
||||
|
||||
@@ -34242,7 +34242,7 @@ msgstr "MOTO"
|
||||
#: pretix/plugins/stripe/templates/pretixplugins/stripe/control.html:64
|
||||
#: pretix/plugins/stripe/templates/pretixplugins/stripe/control.html:67
|
||||
msgid "Payer name"
|
||||
msgstr "Name des Zahlenden"
|
||||
msgstr "Name des Zahlers"
|
||||
|
||||
#: pretix/plugins/stripe/templates/pretixplugins/stripe/control.html:91
|
||||
msgid "Payment receipt"
|
||||
|
||||
@@ -265,7 +265,7 @@ EMAIL_USE_TLS = config.getboolean('mail', 'tls', fallback=False)
|
||||
EMAIL_USE_SSL = config.getboolean('mail', 'ssl', fallback=False)
|
||||
EMAIL_SUBJECT_PREFIX = '[pretix] '
|
||||
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
||||
EMAIL_CUSTOM_SMTP_BACKEND = 'pretixbase.email.CheckPrivateNetworkSmtpBackend'
|
||||
EMAIL_CUSTOM_SMTP_BACKEND = 'pretix.base.email.CheckPrivateNetworkSmtpBackend'
|
||||
EMAIL_TIMEOUT = 60
|
||||
|
||||
ADMINS = [('Admin', n) for n in config.get('mail', 'admins', fallback='').split(",") if n]
|
||||
|
||||
Reference in New Issue
Block a user