diff --git a/src/pretix/base/forms/user.py b/src/pretix/base/forms/user.py index c4bcb16f64..3ce3727357 100644 --- a/src/pretix/base/forms/user.py +++ b/src/pretix/base/forms/user.py @@ -104,7 +104,7 @@ class UserSettingsForm(forms.ModelForm): class User2FADeviceAddForm(forms.Form): - name = forms.CharField(label=_('Device name')) + name = forms.CharField(label=_('Device name'), max_length=64) devicetype = forms.ChoiceField(label=_('Device type'), widget=forms.RadioSelect, choices=( ('totp', _('Smartphone with the Authenticator application')), ('u2f', _('U2F-compatible hardware token (e.g. Yubikey)')), diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py index 7b55894631..f24b4af245 100644 --- a/src/pretix/base/services/cart.py +++ b/src/pretix/base/services/cart.py @@ -163,7 +163,7 @@ class CartManager: if not isinstance(custom_price, Decimal): custom_price = Decimal(custom_price.replace(",", ".")) if custom_price > 100000000: - return error_messages['price_too_high'] + raise CartError(error_messages['price_too_high']) if self.event.settings.display_net_prices: custom_price = round_decimal(custom_price * (100 + item.tax_rate) / 100) price = max(custom_price, price) diff --git a/src/pretix/locale/de/LC_MESSAGES/django.po b/src/pretix/locale/de/LC_MESSAGES/django.po index 48bf079a79..75eae0d9fd 100644 --- a/src/pretix/locale/de/LC_MESSAGES/django.po +++ b/src/pretix/locale/de/LC_MESSAGES/django.po @@ -6709,7 +6709,7 @@ msgstr "Steuer" #: pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html:4 #: pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html:6 msgid "Send out emails" -msgstr "E-Mails versenden" +msgstr "E-Mails verschicken" #: pretix/plugins/sendmail/__init__.py:15 msgid "This plugin allows you to send out emails to all your customers." diff --git a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po index ce2c4d87df..044f1af63e 100644 --- a/src/pretix/locale/de_Informal/LC_MESSAGES/django.po +++ b/src/pretix/locale/de_Informal/LC_MESSAGES/django.po @@ -6180,7 +6180,7 @@ msgstr "Beim Verarbeiten der Daten ist ein interner Fehler aufgetreten." #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html:21 msgid "" "Your import did not contain any transactions that you did not import before." -msgstr "Dein Import enthielt neuen Überweisungen." +msgstr "Dein Import enthielt keine neuen Überweisungen." #: pretix/plugins/banktransfer/templates/pretixplugins/banktransfer/job_detail.html:28 msgid "Orders marked as paid" @@ -6687,7 +6687,7 @@ msgstr "Steuer" #: pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html:4 #: pretix/plugins/sendmail/templates/pretixplugins/sendmail/send_form.html:6 msgid "Send out emails" -msgstr "E-Mails versenden" +msgstr "E-Mails verschicken" #: pretix/plugins/sendmail/__init__.py:15 msgid "This plugin allows you to send out emails to all your customers." diff --git a/src/pretix/plugins/sendmail/views.py b/src/pretix/plugins/sendmail/views.py index 09711c230c..9febb73d67 100644 --- a/src/pretix/plugins/sendmail/views.py +++ b/src/pretix/plugins/sendmail/views.py @@ -94,7 +94,7 @@ class SenderView(EventPermissionRequiredMixin, FormView): if failures: messages.error(self.request, _('Failed to send mails to the following users: {}'.format(' '.join(failures)))) else: - messages.success(self.request, _('Your message has been queued to be sent to the selected users.')) + messages.success(self.request, _('Your message has been queued and will be sent to the selected users.')) return redirect( 'plugins:sendmail:send',