Merge pull request #761 from xzzy/master

_ python 3 fix
dbca-wa · Jan 2, 2020 · 60aff69 · 60aff69
2 parents c3e3d6f + 9899e1d
commit 60aff69
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/ledger/order/utils.py b/ledger/order/utils.py
@@ -20,7 +20,7 @@ def place_order(self, basket, total,  # noqa (too complex (12))
         basket and session data.
         """
         if basket.is_empty:
-            raise ValueError(_("Empty baskets cannot be submitted"))
+            raise ValueError("Empty baskets cannot be submitted")
         if not order_number:
             generator = OrderNumberGenerator()
             order_number = generator.order_number(basket)
@@ -31,8 +31,7 @@ def place_order(self, basket, total,  # noqa (too complex (12))
         except Order.DoesNotExist:
             pass
         else:
-            raise ValueError(_("There is already an order with number %s")
-                             % order_number)
+            raise ValueError("There is already an order with number "+str(order_number))
 
         # Ok - everything seems to be in order, let's place the order
         order = self.create_order_model(

diff --git a/ledger/payments/invoice/utils.py b/ledger/payments/invoice/utils.py
@@ -52,7 +52,7 @@ def create_invoice_and_order(self,basket, total,
         shipping_method = ShippingMethod()
         total = self.get_order_totals(basket, shipping_charge, **kwargs)
         if basket.is_empty:
-            raise ValueError(_("Empty baskets cannot be submitted"))
+            raise ValueError("Empty baskets cannot be submitted")
         if not order_number:
            generator = utils.OrderNumberGenerator()
            order_number = generator.order_number(basket)
@@ -65,8 +65,7 @@ def create_invoice_and_order(self,basket, total,
         else:
             print ('ledger failed')
             print (order_number)
-            raise ValueError(_("There is already an order with number %s")
-                             % order_number)
+            raise ValueError("There is already an order with number "+str(order_number))
 
         # Ok - everything seems to be in order, let's place the order
         order = self.create_order_model(