From 8d2d741db38f530e97a478b5b902e61e6e796055 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 14 Jul 2016 12:20:00 +0200 Subject: [PATCH] [FIX] mass_mailing: do not inherit a view on a `string` attribute A string attribute value can be translated, and therefore the inherit broken if the term is indeed translated. This was the case for this term "Tracked link" in the Dutch language, the "Tracked link" term of the inherited view has been translated, and the inherit was therefore broken as it couldn't find the given node in the base view due to the fact this term was translated. opw-683128 --- addons/mass_mailing/i18n/mass_mailing.pot | 5 ----- addons/mass_mailing/views/mass_mailing.xml | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/addons/mass_mailing/i18n/mass_mailing.pot b/addons/mass_mailing/i18n/mass_mailing.pot index 58de13f63fa..569932abe44 100644 --- a/addons/mass_mailing/i18n/mass_mailing.pot +++ b/addons/mass_mailing/i18n/mass_mailing.pot @@ -1570,11 +1570,6 @@ msgstr "" msgid "Total" msgstr "" -#. module: mass_mailing -#: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_links_search -msgid "Tracked Link" -msgstr "" - #. module: mass_mailing #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form #: model:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_form diff --git a/addons/mass_mailing/views/mass_mailing.xml b/addons/mass_mailing/views/mass_mailing.xml index a8df251edf3..2e5040eba2b 100644 --- a/addons/mass_mailing/views/mass_mailing.xml +++ b/addons/mass_mailing/views/mass_mailing.xml @@ -363,7 +363,7 @@ link.tracker - +