From 6394c628fa2fe75da1908e9ccd70a464a465f2e5 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Tue, 26 May 2020 05:47:50 +0000
Subject: [PATCH] [IMP] mail: make the template easier to translate

Don't try to save bytes, make longer sentences, easier to translate
instead of splitting it into small blocks of one word.

https://www.odoo.com/documentation/13.0/reference/translations.html#blocks

Courtesy of Erwin van der Ploeg for raising the issue

X-original-commit: 737ee6393cd99b0c41272f6cfa9a0acb68276744
---
 addons/mail/i18n/mail.pot            | 26 ++++++++------------------
 addons/mail/views/mail_templates.xml |  4 +++-
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot
index 4754dc7711c..ef08e37e117 100644
--- a/addons/mail/i18n/mail.pot
+++ b/addons/mail/i18n/mail.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server saas~13.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-21 10:46+0000\n"
-"PO-Revision-Date: 2020-04-21 10:46+0000\n"
+"POT-Creation-Date: 2020-05-26 05:48+0000\n"
+"PO-Revision-Date: 2020-05-26 05:48+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -6510,11 +6510,6 @@ msgstr ""
 msgid "channel."
 msgstr ""
 
-#. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
-msgid "created"
-msgstr ""
-
 #. module: mail
 #: model:ir.model.fields.selection,name:mail.selection__mail_activity_type__delay_unit__days
 msgid "days"
@@ -6558,11 +6553,6 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
-msgid "from:"
-msgstr ""
-
 #. module: mail
 #: model:mail.channel,name:mail.channel_all_employees
 msgid "general"
@@ -6570,7 +6560,12 @@ msgstr ""
 
 #. module: mail
 #: model_terms:ir.ui.view,arch_db:mail.message_origin_link
-msgid "has been"
+msgid "has been created from:"
+msgstr ""
+
+#. module: mail
+#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
+msgid "has been modified from:"
 msgstr ""
 
 #. module: mail
@@ -6603,11 +6598,6 @@ msgstr ""
 msgid "model %s does not accept document creation"
 msgstr ""
 
-#. module: mail
-#: model_terms:ir.ui.view,arch_db:mail.message_origin_link
-msgid "modified"
-msgstr ""
-
 #. module: mail
 #: model:ir.model.fields.selection,name:mail.selection__mail_activity_type__delay_unit__months
 msgid "months"
diff --git a/addons/mail/views/mail_templates.xml b/addons/mail/views/mail_templates.xml
index 0430dda0a50..61cd3c47ef5 100644
--- a/addons/mail/views/mail_templates.xml
+++ b/addons/mail/views/mail_templates.xml
@@ -147,7 +147,9 @@
         </template>
 
         <template id="message_origin_link">
-            <p>This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been <span t-if="edit">modified</span><span t-if="not edit">created</span> from:
+            <p>
+                <t t-if="edit">This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been modified from:</t>
+                <t t-else="">This <t t-esc="self.env['ir.model']._get(self._name).name.lower()"/> has been created from:</t>
                 <t t-foreach="origin" t-as="o">
                     <a href="#" t-att-data-oe-model="o._name" t-att-data-oe-id="o.id"> <t t-esc="o.display_name"/></a><span t-if="origin.ids[-1:] != o.ids">, </span>
                 </t>