diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml
index f035cdc8b81..80a52001d49 100644
--- a/addons/auth_signup/data/auth_signup_data.xml
+++ b/addons/auth_signup/data/auth_signup_data.xml
@@ -92,6 +92,7 @@
+ ${object.lang}
@@ -189,6 +190,7 @@
+ ${object.lang}
@@ -281,6 +283,7 @@
+ ${object.lang}
diff --git a/addons/calendar/data/mail_data.xml b/addons/calendar/data/mail_data.xml
index 95940cd34c7..bfc4efd42dd 100644
--- a/addons/calendar/data/mail_data.xml
+++ b/addons/calendar/data/mail_data.xml
@@ -80,6 +80,7 @@
% endif
+ ${object.partner_id.lang}
@@ -163,6 +164,7 @@
% endif
+ ${object.partner_id.lang}
@@ -246,6 +248,7 @@
% endif
+ ${object.partner_id.lang}
diff --git a/addons/crm/data/crm_lead_data.xml b/addons/crm/data/crm_lead_data.xml
index 914fd3f167f..b654c1b6028 100644
--- a/addons/crm/data/crm_lead_data.xml
+++ b/addons/crm/data/crm_lead_data.xml
@@ -64,12 +64,13 @@
Used to give a basis for email recipients, name and to ease the definition of a further
elaborated template. -->
- Lead/Opportunity Mass Mail
+ Lead/Opportunity: Mass Mail
-
${object.partner_id != False and object.partner_id.id}
${(not object.partner_id and object.email_from)|safe}
+ ${object.partner_id.lang}
+
diff --git a/addons/mail/views/res_partner_views.xml b/addons/mail/views/res_partner_views.xml
index 4a9bda24395..8b7b8a3eac0 100644
--- a/addons/mail/views/res_partner_views.xml
+++ b/addons/mail/views/res_partner_views.xml
@@ -66,6 +66,7 @@
${object.id}
+ ${object.lang}
diff --git a/addons/project/data/project_mail_template_data.xml b/addons/project/data/project_mail_template_data.xml
index f590d34ed65..6a9fb6377e9 100644
--- a/addons/project/data/project_mail_template_data.xml
+++ b/addons/project/data/project_mail_template_data.xml
@@ -17,6 +17,7 @@
+ ${object.partner_id.lang}
@@ -85,6 +86,7 @@
+ ${object.rating_get_partner_id().lang}
diff --git a/addons/survey/data/mail_template_data.xml b/addons/survey/data/mail_template_data.xml
index 5e2fca9ed0c..42ed3ee42f3 100644
--- a/addons/survey/data/mail_template_data.xml
+++ b/addons/survey/data/mail_template_data.xml
@@ -32,6 +32,7 @@
+ ${object.partner_id.lang}
@@ -42,10 +43,6 @@
Certification: ${object.survey_id.display_name}
${(object.partner_id.email_formatted or object.email) |safe}
-
- Certification Document
- ${object.partner_id.lang}
-
+
+ Certification Document
+ ${object.partner_id.lang}
+
+
\ No newline at end of file
diff --git a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
index 4716b762575..0461884d845 100644
--- a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
+++ b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
@@ -116,6 +116,7 @@
+ ${ctx['partner_id'].lang}
diff --git a/addons/website_event_track/data/event_track_data.xml b/addons/website_event_track/data/event_track_data.xml
index c5c0569a1ab..8cb0d19115d 100644
--- a/addons/website_event_track/data/event_track_data.xml
+++ b/addons/website_event_track/data/event_track_data.xml
@@ -23,6 +23,7 @@
Thank you,
+ ${object.partner_id.lang}
diff --git a/addons/website_profile/data/profile_data.xml b/addons/website_profile/data/profile_data.xml
index 119f613af6c..ca26a121326 100644
--- a/addons/website_profile/data/profile_data.xml
+++ b/addons/website_profile/data/profile_data.xml
@@ -101,6 +101,7 @@
+ ${object.lang}
diff --git a/addons/website_slides/data/mail_data.xml b/addons/website_slides/data/mail_data.xml
index 7913374723e..246fec87e28 100644
--- a/addons/website_slides/data/mail_data.xml
+++ b/addons/website_slides/data/mail_data.xml
@@ -82,6 +82,7 @@
+ ${object.partner_id.lang}
diff --git a/addons/website_slides_survey/data/mail_template_data.xml b/addons/website_slides_survey/data/mail_template_data.xml
index d423412f296..49f1b72206a 100644
--- a/addons/website_slides_survey/data/mail_template_data.xml
+++ b/addons/website_slides_survey/data/mail_template_data.xml
@@ -22,6 +22,7 @@
+ ${object.partner_id.lang}