diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-01-06 18:06:14 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-01-06 18:06:14 +0100 |
| commit | 98c71b23d355cca207ce65a6e3a02b292b54a4ba (patch) | |
| tree | 5e842e841797162f0c735be54bb49f3e413b5cbf /addons/website_mass_mailing | |
| parent | 100077f035b9893111ebb40dc971a0733ffec955 (diff) | |
| parent | 9073ecb6f59e1834bdd5e1aed96d6be4b03b00d5 (diff) | |
[MERGE] forward port branch saas-11 up to 9073ecb6f59
Diffstat (limited to 'addons/website_mass_mailing')
| -rw-r--r-- | addons/website_mass_mailing/i18n/website_mass_mailing.pot | 10 | ||||
| -rw-r--r-- | addons/website_mass_mailing/static/src/js/website_mass_mailing.js | 7 |
2 files changed, 15 insertions, 2 deletions
diff --git a/addons/website_mass_mailing/i18n/website_mass_mailing.pot b/addons/website_mass_mailing/i18n/website_mass_mailing.pot index bf7b6bbd4bb..6491c32c52a 100644 --- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot +++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot @@ -142,11 +142,21 @@ msgid "You are not subscribed to any of our mailing list." msgstr "" #. module: website_mass_mailing +#. openerp-web +#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:155 #: model:ir.ui.view,arch_db:website_mass_mailing.unsubscribed +#, python-format msgid "Your changes have been saved." msgstr "" #. module: website_mass_mailing +#. openerp-web +#: code:addons/website_mass_mailing/static/src/js/website_mass_mailing.js:158 +#, python-format +msgid "Your changes have not been saved, try again later." +msgstr "" + +#. module: website_mass_mailing #: model:ir.model,name:website_mass_mailing.model_mass_mailing_config_settings msgid "mass.mailing.config.settings" msgstr "" diff --git a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js index a9e8ea86273..ae499fe2438 100644 --- a/addons/website_mass_mailing/static/src/js/website_mass_mailing.js +++ b/addons/website_mass_mailing/static/src/js/website_mass_mailing.js @@ -124,8 +124,11 @@ animation.registry.newsletter_popup = animation.Class.extend({ odoo.define('mass_mailing.unsubscribe', function (require) { var ajax = require('web.ajax'); + var core = require('web.core'); require('web_editor.base'); // wait for implicit dependencies to load + var _t = core._t; + if (!$('.o_unsubscribe_form').length) { return $.Deferred().reject("DOM doesn't contain '.o_unsubscribe_form'"); } @@ -148,10 +151,10 @@ odoo.define('mass_mailing.unsubscribe', function (require) { ajax.jsonRpc('/mail/mailing/unsubscribe', 'call', {'opt_in_ids': checked_ids, 'opt_out_ids': unchecked_ids, 'email': email, 'mailing_id': mailing_id}) .then(function(result) { - $('.alert-info').html('Your changes has been saved.').removeClass('alert-info').addClass('alert-success'); + $('.alert-info').html(_t('Your changes have been saved.')).removeClass('alert-info').addClass('alert-success'); }) .fail(function() { - $('.alert-info').html('You changes has not been saved, try again later.').removeClass('alert-info').addClass('alert-warning'); + $('.alert-info').html(_t('Your changes have not been saved, try again later.')).removeClass('alert-info').addClass('alert-warning'); }); }); }); |