From c5b7ff66b7aaa16d7a56a7c6c36bfa5250f31374 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Tue, 31 Jan 2023 22:11:53 +0100
Subject: [PATCH] Fix incorrecly used error messages

---
 src/pretix/base/services/cart.py   |  4 ++--
 src/pretix/presale/checkoutflow.py | 23 +++++++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/pretix/base/services/cart.py b/src/pretix/base/services/cart.py
index 13f5b36085..606227c767 100644
--- a/src/pretix/base/services/cart.py
+++ b/src/pretix/base/services/cart.py
@@ -1073,11 +1073,11 @@ class CartManager:
 
                 if voucher_available_count < 1:
                     if op.voucher in self._voucher_depend_on_cart:
-                        err = err or _(error_messages['voucher_redeemed_cart']) % self.event.settings.reservation_time
+                        err = err or (error_messages['voucher_redeemed_cart'] % self.event.settings.reservation_time)
                     else:
                         err = err or error_messages['voucher_redeemed']
                 elif voucher_available_count < requested_count:
-                    err = err or _(error_messages['voucher_redeemed_partial']) % voucher_available_count
+                    err = err or (error_messages['voucher_redeemed_partial'] % voucher_available_count)
 
                 available_count = min(quota_available_count, voucher_available_count)
 
diff --git a/src/pretix/presale/checkoutflow.py b/src/pretix/presale/checkoutflow.py
index 7598306a4e..a224d90e07 100644
--- a/src/pretix/presale/checkoutflow.py
+++ b/src/pretix/presale/checkoutflow.py
@@ -631,35 +631,30 @@ class AddOnsStep(CartMixin, AsyncAction, TemplateFlowStep):
                     selected[i, None] = val, price
 
         if sum(a[0] for a in selected.values()) > category['max_count']:
-            # TODO: Proper pluralization
             raise ValidationError(
-                _(error_messages['addon_max_count']),
-                'addon_max_count',
-                {
+                error_messages['addon_max_count'] % {
                     'base': str(form['item'].name),
                     'max': category['max_count'],
                     'cat': str(category['category'].name),
-                }
+                },
+                'addon_max_count'
             )
         elif sum(a[0] for a in selected.values()) < category['min_count']:
-            # TODO: Proper pluralization
             raise ValidationError(
-                _(error_messages['addon_min_count']),
-                'addon_min_count',
-                {
+                error_messages['addon_min_count'] % {
                     'base': str(form['item'].name),
                     'min': category['min_count'],
                     'cat': str(category['category'].name),
-                }
+                },
+                'addon_min_count',
             )
         elif any(sum(v[0] for k, v in selected.items() if k[0] == i) > 1 for i in category['items']) and not category['multi_allowed']:
             raise ValidationError(
-                _(error_messages['addon_no_multi']),
-                'addon_no_multi',
-                {
+                error_messages['addon_no_multi'] % {
                     'base': str(form['item'].name),
                     'cat': str(category['category'].name),
-                }
+                },
+                'addon_no_multi',
             )
         try:
             validate_cart_addons.send(