From 4ddf8f279fb240902a315420ba0066d15ecc6eb5 Mon Sep 17 00:00:00 2001 From: Victor Feyens Date: Mon, 21 Jun 2021 16:43:19 +0000 Subject: [PATCH] [IMP] sale: pass placeholders content to translation call. Use improved API from #52155 to fallback on the source string when the translated string is invalid. --- addons/sale/models/sale_order.py | 4 ++-- addons/sale/models/sale_order_line.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sale/models/sale_order.py b/addons/sale/models/sale_order.py index 2734f300d3e..8de9400d2f8 100644 --- a/addons/sale/models/sale_order.py +++ b/addons/sale/models/sale_order.py @@ -449,7 +449,7 @@ class SaleOrder(models.Model): return { 'warning': { - 'title': _("Warning for %s") % partner.name, + 'title': _("Warning for %s", partner.name), 'message': partner.sale_warn_msg, } } @@ -577,7 +577,7 @@ class SaleOrder(models.Model): self.ensure_one() journal = self.env['account.move'].with_context(default_move_type='out_invoice')._get_default_journal() if not journal: - raise UserError(_('Please define an accounting sales journal for the company %s (%s).') % (self.company_id.name, self.company_id.id)) + raise UserError(_('Please define an accounting sales journal for the company %s (%s).', self.company_id.name, self.company_id.id)) invoice_vals = { 'ref': self.client_order_ref or '', diff --git a/addons/sale/models/sale_order_line.py b/addons/sale/models/sale_order_line.py index 2c3a991ea7d..a6c0fa86c58 100644 --- a/addons/sale/models/sale_order_line.py +++ b/addons/sale/models/sale_order_line.py @@ -158,7 +158,7 @@ class SaleOrderLine(models.Model): lines = super().create(vals_list) for line in lines: if line.product_id and line.order_id.state == 'sale': - msg = _("Extra line with %s ") % (line.product_id.display_name,) + msg = _("Extra line with %s", line.product_id.display_name) line.order_id.message_post(body=msg) # create an analytic account if at least an expense product if line.product_id.expense_policy not in [False, 'no'] and not line.order_id.analytic_account_id: