From c4ba5adc0437d54a8a88bd91032e853ea02a666a Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Wed, 25 Oct 2017 10:57:59 +0200 Subject: [PATCH] [FIX] utm: use proper Englsih abreviation ex is French e.g. should be used --- addons/utm/i18n/utm.pot | 6 +++--- addons/utm/models/utm.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/utm/i18n/utm.pot b/addons/utm/i18n/utm.pot index 51e41060a73..ae5f9842f84 100644 --- a/addons/utm/i18n/utm.pot +++ b/addons/utm/i18n/utm.pot @@ -215,7 +215,7 @@ msgstr "" #: model:ir.model.fields,help:utm.field_link_tracker_campaign_id #: model:ir.model.fields,help:utm.field_sale_order_campaign_id #: model:ir.model.fields,help:utm.field_utm_mixin_campaign_id -msgid "This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special" +msgid "This is a name that helps you keep track of your different campaign efforts, i.e. Fall_Drive, Christmas_Special" msgstr "" #. module: utm @@ -225,7 +225,7 @@ msgstr "" #: model:ir.model.fields,help:utm.field_link_tracker_medium_id #: model:ir.model.fields,help:utm.field_sale_order_medium_id #: model:ir.model.fields,help:utm.field_utm_mixin_medium_id -msgid "This is the method of delivery.Ex: Postcard, Email, or Banner Ad" +msgid "This is the method of delivery, i.e. Postcard, Email, or Banner Ad" msgstr "" #. module: utm @@ -235,7 +235,7 @@ msgstr "" #: model:ir.model.fields,help:utm.field_link_tracker_source_id #: model:ir.model.fields,help:utm.field_sale_order_source_id #: model:ir.model.fields,help:utm.field_utm_mixin_source_id -msgid "This is the source of the link Ex:Search Engine, another domain,or name of email list" +msgid "This is the source of the link, i.e. Search Engine, another domain, or name of email list" msgstr "" #. module: utm diff --git a/addons/utm/models/utm.py b/addons/utm/models/utm.py index b73329c1011..c6e5b680b67 100644 --- a/addons/utm/models/utm.py +++ b/addons/utm/models/utm.py @@ -37,11 +37,11 @@ class UtmMixin(models.AbstractModel): _name = 'utm.mixin' campaign_id = fields.Many2one('utm.campaign', 'Campaign', - help="This is a name that helps you keep track of your different campaign efforts Ex: Fall_Drive, Christmas_Special") + help="This is a name that helps you keep track of your different campaign efforts, i.e. Fall_Drive, Christmas_Special") source_id = fields.Many2one('utm.source', 'Source', - help="This is the source of the link Ex:Search Engine, another domain,or name of email list") + help="This is the source of the link, i.e. Search Engine, another domain, or name of email list") medium_id = fields.Many2one('utm.medium', 'Medium', - help="This is the method of delivery.Ex: Postcard, Email, or Banner Ad", oldname='channel_id') + help="This is the method of delivery, i.e. Postcard, Email, or Banner Ad", oldname='channel_id') def tracking_fields(self): # This function cannot be overridden in a model which inherit utm.mixin