%(meeting)s
%(subject_string)s %(subject_link)s
%(duration)s
") % { - 'meeting': escape(_("Meeting scheduled at %s")) % meeting_time, + 'meeting': _("Meeting scheduled at %s", meeting_time), 'subject_string': _("Subject: "), 'subject_link': meeting._get_html_link(), 'duration': _("Duration: %s", duration), diff --git a/addons/crm_livechat/models/discuss_channel.py b/addons/crm_livechat/models/discuss_channel.py index ee9b6341b39..a34b251dff7 100644 --- a/addons/crm_livechat/models/discuss_channel.py +++ b/addons/crm_livechat/models/discuss_channel.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import escape from odoo import models, _ from odoo.tools import html2plaintext @@ -16,7 +15,7 @@ class DiscussChannel(models.Model): msg = _('Create a new lead (/lead lead title)') else: lead = self._convert_visitor_to_lead(partner, key) - msg = escape(_('Created a new lead: %s')) % lead._get_html_link() + msg = _('Created a new lead: %s', lead._get_html_link()) self._send_transient_message(partner, msg) def _convert_visitor_to_lead(self, partner, key): diff --git a/addons/hr_expense/models/account_move.py b/addons/hr_expense/models/account_move.py index 6f5142a9521..284199b8428 100644 --- a/addons/hr_expense/models/account_move.py +++ b/addons/hr_expense/models/account_move.py @@ -1,7 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import escape - from odoo import models, fields, api, _ from odoo.exceptions import UserError from odoo.tools.misc import frozendict @@ -29,7 +27,7 @@ class AccountMove(models.Model): def _creation_message(self): if self.expense_sheet_id: - return escape(_("Expense entry created from: %s")) % self.expense_sheet_id._get_html_link() + return _("Expense entry created from: %s", self.expense_sheet_id._get_html_link()) return super()._creation_message() @api.depends('expense_sheet_id') diff --git a/addons/hr_expense/models/account_payment.py b/addons/hr_expense/models/account_payment.py index 22eb648121e..7c890e1a080 100644 --- a/addons/hr_expense/models/account_payment.py +++ b/addons/hr_expense/models/account_payment.py @@ -1,7 +1,5 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import escape - from odoo import models, _ from odoo.exceptions import UserError @@ -40,7 +38,7 @@ class AccountPayment(models.Model): # EXTENDS mail self.ensure_one() if self.move_id.expense_sheet_id: - return escape(_("Payment created for: %s")) % self.move_id.expense_sheet_id._get_html_link() + return _("Payment created for: %s", self.move_id.expense_sheet_id._get_html_link()) return super()._creation_message() def unlink(self): diff --git a/addons/hr_recruitment_survey/wizard/survey_invite.py b/addons/hr_recruitment_survey/wizard/survey_invite.py index 3c1a9bae9b8..e4b44b151f1 100644 --- a/addons/hr_recruitment_survey/wizard/survey_invite.py +++ b/addons/hr_recruitment_survey/wizard/survey_invite.py @@ -1,6 +1,6 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import Markup, escape +from markupsafe import Markup from odoo import fields, models, _ from odoo.tools.misc import clean_context @@ -39,10 +39,10 @@ class SurveyInvite(models.TransientModel): partner = self.applicant_id.partner_id survey_link = survey._get_html_link(title=survey.title) partner_link = partner._get_html_link() - content = escape(_('The survey %(survey_link)s has been sent to %(partner_link)s')) % { - 'survey_link': survey_link, - 'partner_link': partner_link, - } + content = _('The survey %(survey_link)s has been sent to %(partner_link)s', + survey_link=survey_link, + partner_link=partner_link, + ) body = Markup('
%s
') % content self.applicant_id.message_post(body=body) return super().action_invite() diff --git a/addons/hr_skills_slides/models/slide_channel.py b/addons/hr_skills_slides/models/slide_channel.py index 6e5e2e289f4..7f65563f2bd 100644 --- a/addons/hr_skills_slides/models/slide_channel.py +++ b/addons/hr_skills_slides/models/slide_channel.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import Markup, escape +from markupsafe import Markup from odoo import fields, models, _ from odoo.tools import html2plaintext @@ -50,11 +50,11 @@ class SlideChannelPartner(models.Model): super()._send_completed_mail() for scp in self: if self.env.user.employee_ids: - msg = escape(_('The employee has completed the course %s')) % \ + msg = _('The employee has completed the course %s', Markup('%(course)s') % { 'link': scp.channel_id.website_url, 'course': scp.channel_id.name, - } + }) self.env.user.employee_id.message_post(body=msg) class Channel(models.Model): @@ -65,11 +65,11 @@ class Channel(models.Model): if member_status == 'joined': for channel in self: channel._message_employee_chatter( - escape(_('The employee subscribed to the course %s')) % \ - Markup('%(course)s') % { - 'link': channel.website_url, - 'course': channel.name - }, + _('The employee subscribed to the course %s', + Markup('%(course)s') % { + 'link': channel.website_url, + 'course': channel.name + }), target_partners ) return res @@ -81,10 +81,11 @@ class Channel(models.Model): for channel in self: channel._message_employee_chatter( - Markup(_('The employee left the course %(course)s')) % { - 'link': channel.website_url, - 'course': channel.name, - }, + _('The employee left the course %s', + Markup('%(course)s') % { + 'link': channel.website_url, + 'course': channel.name, + }), partners) return res diff --git a/addons/im_livechat_mail_bot/models/mail_bot.py b/addons/im_livechat_mail_bot/models/mail_bot.py index f892f24a645..45905c16c1b 100644 --- a/addons/im_livechat_mail_bot/models/mail_bot.py +++ b/addons/im_livechat_mail_bot/models/mail_bot.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import Markup, escape +from markupsafe import Markup from odoo import models, _ @@ -22,6 +22,6 @@ class MailBot(models.AbstractModel): # repeat question if needed elif odoobot_state == 'onboarding_canned' and not self._is_help_requested(body): self.env.user.odoobot_failed = True - return escape(_("Not sure what you are doing. Please, type %s and wait for the propositions. Select one of them and press enter.")) % \ - Markup(":") + return _("Not sure what you are doing. Please, type %s and wait for the propositions. Select one of them and press enter.", + Markup(":")) return super(MailBot, self)._get_answer(record, body, values, command) diff --git a/addons/l10n_es_edi_facturae/models/account_move.py b/addons/l10n_es_edi_facturae/models/account_move.py index 732dc6798df..c01c1b7c97a 100644 --- a/addons/l10n_es_edi_facturae/models/account_move.py +++ b/addons/l10n_es_edi_facturae/models/account_move.py @@ -1,7 +1,7 @@ import re from collections import defaultdict -from markupsafe import escape, Markup +from markupsafe import Markup from odoo import fields, models, api, _, Command from odoo.exceptions import UserError @@ -454,7 +454,7 @@ class AccountMove(models.Model): }) with other_invoice._get_edi_creation(): self._import_invoice_facturae_invoice(other_invoice, partner, node) - other_invoice.message_post(body=escape(_("Created from attachment in %s")) % invoice._get_html_link()) + other_invoice.message_post(body=_("Created from attachment in %s", invoice._get_html_link())) def _import_invoice_facturae_invoice(self, invoice, partner, tree): logs = [] diff --git a/addons/maintenance/models/maintenance.py b/addons/maintenance/models/maintenance.py index 57712fe1fac..9a2fae68bc6 100644 --- a/addons/maintenance/models/maintenance.py +++ b/addons/maintenance/models/maintenance.py @@ -2,7 +2,6 @@ import ast from dateutil.relativedelta import relativedelta -from markupsafe import escape from odoo import api, fields, models, SUPERUSER_ID, _ from odoo.exceptions import UserError @@ -348,7 +347,7 @@ class MaintenanceRequest(models.Model): def _get_activity_note(self): self.ensure_one() if self.equipment_id: - return escape(_('Request planned for %s')) % self.equipment_id._get_html_link() + return _('Request planned for %s', self.equipment_id._get_html_link()) return False def activity_update(self): diff --git a/addons/mrp/models/mrp_unbuild.py b/addons/mrp/models/mrp_unbuild.py index dc875dbcf16..8f816f351a7 100644 --- a/addons/mrp/models/mrp_unbuild.py +++ b/addons/mrp/models/mrp_unbuild.py @@ -7,7 +7,6 @@ from odoo.tools import float_compare, float_round from odoo.osv import expression from collections import defaultdict -from markupsafe import escape class MrpUnbuild(models.Model): _name = "mrp.unbuild" @@ -201,11 +200,11 @@ class MrpUnbuild(models.Model): produced_move_line_ids = produce_moves.mapped('move_line_ids').filtered(lambda ml: ml.qty_done > 0) consume_moves.mapped('move_line_ids').write({'produce_line_ids': [(6, 0, produced_move_line_ids.ids)]}) if self.mo_id: - unbuild_msg = escape(_("%(qty)s %(measure)s unbuilt in %(order)s")) % { - 'qty': self.product_qty, - 'measure': self.product_uom_id.name, - 'order': self._get_html_link(), - } + unbuild_msg = _("%(qty)s %(measure)s unbuilt in %(order)s", + qty=self.product_qty, + measure=self.product_uom_id.name, + order=self._get_html_link(), + ) self.mo_id.message_post( body=unbuild_msg, subtype_xmlid='mail.mt_note', diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py index dbf18e8bbb6..25887a8f652 100644 --- a/addons/point_of_sale/models/pos_order.py +++ b/addons/point_of_sale/models/pos_order.py @@ -6,7 +6,6 @@ from markupsafe import Markup from functools import partial from itertools import groupby from collections import defaultdict -from markupsafe import escape import psycopg2 import pytz @@ -596,8 +595,8 @@ class PosOrder(models.Model): def _create_invoice(self, move_vals): self.ensure_one() new_move = self.env['account.move'].sudo().with_company(self.company_id).with_context(default_move_type=move_vals['move_type']).create(move_vals) - message = escape(_("This invoice has been created from the point of sale session: %s")) % \ - self._get_html_link() + message = _("This invoice has been created from the point of sale session: %s", + self._get_html_link()) new_move.message_post(body=message) if self.config_id.cash_rounding: diff --git a/addons/sale/models/sale_order.py b/addons/sale/models/sale_order.py index f9fd4385ffa..acd7c0e9d76 100644 --- a/addons/sale/models/sale_order.py +++ b/addons/sale/models/sale_order.py @@ -2,7 +2,6 @@ from datetime import timedelta from itertools import groupby -from markupsafe import escape from odoo import api, fields, models, SUPERUSER_ID, _ from odoo.exceptions import AccessError, UserError, ValidationError @@ -1078,8 +1077,8 @@ class SaleOrder(models.Model): self._recompute_taxes() if self.partner_id: - self.message_post(body=escape(_("Product taxes have been recomputed according to fiscal position %s.")) % \ - self.fiscal_position_id._get_html_link() if self.fiscal_position_id else "", + self.message_post(body=_("Product taxes have been recomputed according to fiscal position %s.", + self.fiscal_position_id._get_html_link() if self.fiscal_position_id else "") ) def _recompute_taxes(self): @@ -1093,8 +1092,8 @@ class SaleOrder(models.Model): self._recompute_prices() if self.pricelist_id: - message = escape(_("Product prices have been recomputed according to pricelist %s.")) % \ - self.pricelist_id._get_html_link() + message = _("Product prices have been recomputed according to pricelist %s.", + self.pricelist_id._get_html_link()) else: message = _("Product prices have been recomputed.") self.message_post(body=message) @@ -1696,7 +1695,7 @@ class SaleOrder(models.Model): order.activity_schedule( 'sale.mail_act_sale_upsell', user_id=order.user_id.id or order.partner_id.user_id.id, - note=escape(_("Upsell %(order)s for customer %(customer)s")) % {"order":order_ref, "customer":customer_ref}) + note=_("Upsell %(order)s for customer %(customer)s", order=order_ref, customer=customer_ref)) def _prepare_analytic_account_data(self, prefix=None): """ Prepare SO analytic account creation values. diff --git a/addons/sale/wizard/sale_make_invoice_advance.py b/addons/sale/wizard/sale_make_invoice_advance.py index 5158b476076..ececc03d58d 100644 --- a/addons/sale/wizard/sale_make_invoice_advance.py +++ b/addons/sale/wizard/sale_make_invoice_advance.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import escape - from odoo import _, api, fields, models, SUPERUSER_ID from odoo.exceptions import UserError from odoo.fields import Command @@ -266,9 +264,8 @@ class SaleAdvancePaymentInv(models.TransientModel): ) order.with_user(poster).message_post( - body=escape(_( - "%s has been created", - )) % invoice._get_html_link(title=_("Down payment invoice")), + body=_("%s has been created", + invoice._get_html_link(title=_("Down payment invoice"))), ) return invoice diff --git a/addons/sale_project/models/sale_order_line.py b/addons/sale_project/models/sale_order_line.py index c1accbb7229..2dbd9f7bfa2 100644 --- a/addons/sale_project/models/sale_order_line.py +++ b/addons/sale_project/models/sale_order_line.py @@ -2,7 +2,6 @@ # Part of Odoo. See LICENSE file for full copyright and licensing details. from collections import defaultdict -from markupsafe import escape from odoo import api, Command, fields, models, _ from odoo.exceptions import AccessError @@ -115,7 +114,7 @@ class SaleOrderLine(models.Model): line.sudo()._timesheet_service_generation() # if the SO line created a task, post a message on the order if line.task_id and not has_task: - msg_body = escape(_("Task Created (%s): %s")) % (line.product_id.name, line.task_id._get_html_link()) + msg_body = _("Task Created (%s): %s", line.product_id.name, line.task_id._get_html_link()) line.order_id.message_post(body=msg_body) # Set a service SOL on the project, if any is given @@ -243,7 +242,7 @@ class SaleOrderLine(models.Model): task = self.env['project.task'].sudo().create(values) self.write({'task_id': task.id}) # post message on task - task_msg = escape(_("This task has been created from: %s (%s)")) % ( + task_msg = _("This task has been created from: %s (%s)", self.order_id._get_html_link(), self.product_id.name ) diff --git a/addons/stock/models/stock_move.py b/addons/stock/models/stock_move.py index 186ed3a7604..8d0d837be52 100644 --- a/addons/stock/models/stock_move.py +++ b/addons/stock/models/stock_move.py @@ -4,7 +4,6 @@ from collections import defaultdict from datetime import timedelta -from markupsafe import escape from operator import itemgetter from re import findall as regex_findall @@ -768,7 +767,7 @@ Please change the quantity done or the rounding precision of your unit of measur if not documents or not doc_orig: return - msg = escape(_("The deadline has been automatically updated due to a delay on %s.")) % doc_orig[0]._get_html_link() + msg = _("The deadline has been automatically updated due to a delay on %s.", doc_orig[0]._get_html_link()) msg_subject = _("Deadline updated due to delay on %s", doc_orig[0].name) # write the message on each document for doc in documents: diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index 746eae0d903..225500b9daf 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -7,7 +7,6 @@ import time from ast import literal_eval from datetime import date, timedelta from collections import defaultdict -from markupsafe import escape from odoo import SUPERUSER_ID, _, api, Command, fields, models from odoo.addons.stock.models.stock_move import PROCUREMENT_PRIORITIES @@ -1363,7 +1362,7 @@ class Picking(models.Model): 'backorder_id': picking.id }) picking.message_post( - body=escape(_('The backorder %s has been created.')) % backorder_picking._get_html_link() + body=_('The backorder %s has been created.', backorder_picking._get_html_link()) ) moves_to_backorder.write({'picking_id': backorder_picking.id}) moves_to_backorder.move_line_ids.package_level_id.write({'picking_id':backorder_picking.id}) diff --git a/addons/stock_picking_batch/models/stock_picking.py b/addons/stock_picking_batch/models/stock_picking.py index 3b2600142ae..f7db0f6e965 100644 --- a/addons/stock_picking_batch/models/stock_picking.py +++ b/addons/stock_picking_batch/models/stock_picking.py @@ -1,8 +1,6 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. -from markupsafe import escape - from odoo import _, api, Command, fields, models from odoo.osv import expression from odoo.exceptions import ValidationError @@ -241,7 +239,7 @@ class StockPicking(models.Model): pickings = self.filtered(lambda p: p.user_id.id != user_id) pickings.write({'user_id': user_id}) for pick in pickings: - log_message = escape(_('Assigned to %s Responsible')) % pick.batch_id._get_html_link() + log_message = _('Assigned to %s Responsible', pick.batch_id._get_html_link()) pick.message_post(body=log_message) def action_view_batch(self):