From c389a6576bcb89c458014413f5026743d418b3e2 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 5 Jan 2017 16:44:02 +0100 Subject: [PATCH] [FIX] website_mass_mailing: typo in unsubscription confirmations and translatable There was an obvious typo in these confirmations, and they were not yet translatable. opw-703745 --- .../website_mass_mailing/i18n/website_mass_mailing.pot | 10 ++++++++++ .../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 e1c85a0ab7f..c4b658821fe 100644 --- a/addons/website_mass_mailing/i18n/website_mass_mailing.pot +++ b/addons/website_mass_mailing/i18n/website_mass_mailing.pot @@ -107,10 +107,20 @@ 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.ui.view,arch_db:website_mass_mailing.mailing_list_subscribe #: model:ir.ui.view,arch_db:website_mass_mailing.website_popup_snippet 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 bdc76baa2ae..e744eea5320 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 @@ -125,8 +125,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'"); } @@ -149,10 +152,10 @@ if(!$('.o_unsubscribe_form').length) { 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'); }); });