summaryrefslogtreecommitdiff
path: root/addons/mail/models/mail_thread.py
diff options
context:
space:
mode:
authorMartin Trigaux <mat@odoo.com>2020-06-15 15:16:16 +0200
committerMartin Trigaux <mat@odoo.com>2020-06-18 13:03:34 +0200
commit80e97e98ce76067db1079af8feeef667cfadf837 (patch)
treee261d34e3f8458bd99011f60f508bcce2c723baf /addons/mail/models/mail_thread.py
parent4a92a183e8631512a8b018eedaf9bf4956ca85e9 (diff)
[IMP] *: use named placeholders in translated message
When more than one parameter is present in a message, it helps the translation to use named placeholder. This way, the order can be changed. It also helps the comprehension of the message.
Diffstat (limited to 'addons/mail/models/mail_thread.py')
-rw-r--r--addons/mail/models/mail_thread.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index 3f8818bc386..dcadca5b281 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -798,7 +798,12 @@ class MailThread(models.AbstractModel):
# Existing Document: check if exists and model accepts the mailgateway; if not, fallback on create if allowed
if thread_id:
if not record_set.exists():
- self._routing_warn(_('reply to missing document (%s,%s), fall back on document creation') % (model, thread_id), message_id, route, False)
+ self._routing_warn(
+ _('reply to missing document (%(model)s,%(thread)s), fall back on document creation', model=model, thread=thread_id),
+ message_id,
+ route,
+ False
+ )
thread_id = None
elif not hasattr(record_set, 'message_update'):
self._routing_warn(_('reply to model %s that does not accept document update, fall back on document creation', model), message_id, route, False)
@@ -834,7 +839,12 @@ class MailThread(models.AbstractModel):
else:
error_code = self.env['mail.alias.mixin']._alias_check_contact_on_record(obj, message, message_dict, alias)
if error_code is not True:
- self._routing_warn(_('alias %s: %s') % (alias.alias_name, error_code or _('unknown error')), message_id, route, False)
+ self._routing_warn(
+ _('alias %(name)s: %(error)s', name=alias.alias_name, error=error_code or _('unknown error')),
+ message_id,
+ route,
+ False
+ )
body = alias._get_alias_bounced_body(message_dict)
self._routing_create_bounce_email(email_from, body, message, references=message_id)
return False