diff --git a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js index b89bf31912..8cfa6fab8e 100644 --- a/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js +++ b/assets/js/src/newsletter_editor/blocks/automatedLatestContent.js @@ -83,7 +83,7 @@ define([ that.get('_container').get('blocks').reset(content, {parse: true}); that.trigger('postsChanged'); }).fail(function(error) { - MailPoet.Notice(MailPoetI18n.failedToFetchRenderedPosts); + MailPoet.Notice.error(App.getConfig().get('translations.failedToFetchRenderedPosts')); }); }, /** diff --git a/assets/js/src/newsletter_editor/blocks/footer.js b/assets/js/src/newsletter_editor/blocks/footer.js index d72a065bc1..52deaa5e60 100644 --- a/assets/js/src/newsletter_editor/blocks/footer.js +++ b/assets/js/src/newsletter_editor/blocks/footer.js @@ -79,7 +79,7 @@ define([ }, mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(), - mailpoet_custom_fields_window_title: MailPoetI18n.customFieldsWindowTitle, + mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'), }); }, }); diff --git a/assets/js/src/newsletter_editor/blocks/header.js b/assets/js/src/newsletter_editor/blocks/header.js index 5d5b182184..7349a51f63 100644 --- a/assets/js/src/newsletter_editor/blocks/header.js +++ b/assets/js/src/newsletter_editor/blocks/header.js @@ -79,7 +79,7 @@ define([ }, mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(), - mailpoet_custom_fields_window_title: MailPoetI18n.customFieldsWindowTitle, + mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'), }); }, }); diff --git a/assets/js/src/newsletter_editor/blocks/posts.js b/assets/js/src/newsletter_editor/blocks/posts.js index 491fd1cf20..acc806e5a3 100644 --- a/assets/js/src/newsletter_editor/blocks/posts.js +++ b/assets/js/src/newsletter_editor/blocks/posts.js @@ -101,7 +101,7 @@ define([ that.get('_selectedPosts').reset(); // Empty out the collection that.trigger('change:_availablePosts'); }).fail(function() { - MailPoet.Notice(MailPoetI18n.failedToFetchAvailablePosts); + MailPoet.Notice.error(App.getConfig().get('translations.failedToFetchAvailablePosts')); }); }, _refreshTransformedPosts: function() { @@ -118,7 +118,7 @@ define([ CommunicationComponent.getTransformedPosts(data).done(function(posts) { that.get('_transformedPosts').get('blocks').reset(posts, {parse: true}); }).fail(function() { - MailPoet.Notice(MailPoetI18n.failedToFetchRenderedPosts); + MailPoet.Notice.error(App.getConfig().get('translations.failedToFetchRenderedPosts')); }); }, _insertSelectedPosts: function() { @@ -134,7 +134,7 @@ define([ CommunicationComponent.getTransformedPosts(data).done(function(posts) { collection.add(posts, { at: index }); }).fail(function() { - MailPoet.Notice(MailPoetI18n.failedToFetchRenderedPosts); + MailPoet.Notice.error(App.getConfig().get('translations.failedToFetchRenderedPosts')); }); }, }); diff --git a/assets/js/src/newsletter_editor/blocks/text.js b/assets/js/src/newsletter_editor/blocks/text.js index acdc99a73a..1d015c7cf3 100644 --- a/assets/js/src/newsletter_editor/blocks/text.js +++ b/assets/js/src/newsletter_editor/blocks/text.js @@ -77,7 +77,7 @@ define([ }, mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(), - mailpoet_custom_fields_window_title: MailPoetI18n.customFieldsWindowTitle, + mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'), }); } }, diff --git a/assets/js/src/newsletter_editor/components/save.js b/assets/js/src/newsletter_editor/components/save.js index c8cc76c05b..580b5a1f98 100644 --- a/assets/js/src/newsletter_editor/components/save.js +++ b/assets/js/src/newsletter_editor/components/save.js @@ -191,7 +191,7 @@ define([ if (templateName === '') { MailPoet.Notice.error( - MailPoetI18n.templateNameMissing, + App.getConfig().get('translations.templateNameMissing'), { positionAfter: that.$el, scroll: true, @@ -199,7 +199,7 @@ define([ ); } else if (templateDescription === '') { MailPoet.Notice.error( - MailPoetI18n.templateDescriptionMissing, + App.getConfig().get('translations.templateDescriptionMissing'), { positionAfter: that.$el, scroll: true, @@ -211,7 +211,7 @@ define([ description: templateDescription, }).done(function() { MailPoet.Notice.success( - MailPoetI18n.templateSaved, + App.getConfig().get('translations.templateSaved'), { positionAfter: that.$el, scroll: true, @@ -219,7 +219,7 @@ define([ ); }).fail(function() { MailPoet.Notice.error( - MailPoetI18n.templateSaveFailed, + App.getConfig().get('translations.templateSaveFailed'), { positionAfter: that.$el, scroll: true, @@ -244,7 +244,7 @@ define([ if (templateName === '') { MailPoet.Notice.error( - MailPoetI18n.templateNameMissing, + App.getConfig().get('translations.templateNameMissing'), { positionAfter: that.$el, scroll: true, @@ -252,7 +252,7 @@ define([ ); } else if (templateDescription === '') { MailPoet.Notice.error( - MailPoetI18n.templateDescriptionMissing, + App.getConfig().get('translations.templateDescriptionMissing'), { positionAfter: that.$el, scroll: true, @@ -285,7 +285,7 @@ define([ if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') && JSON.stringify(jsonObject).indexOf("[unsubscribeUrl]") < 0) { - this.showValidationError(MailPoetI18n.unsubscribeLinkMissing); + this.showValidationError(App.getConfig().get('translations.unsubscribeLinkMissing')); return; } diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js index 186a17441e..85fff4fc40 100644 --- a/assets/js/src/newsletter_editor/components/sidebar.js +++ b/assets/js/src/newsletter_editor/components/sidebar.js @@ -1,13 +1,24 @@ define([ 'newsletter_editor/App', 'newsletter_editor/components/communication', + 'mailpoet', 'backbone', 'backbone.marionette', 'backbone.supermodel', 'underscore', 'jquery', 'sticky-kit' - ], function(App, CommunicationComponent, Backbone, Marionette, SuperModel, _, jQuery, StickyKit) { + ], function( + App, + CommunicationComponent, + MailPoet, + Backbone, + Marionette, + SuperModel, + _, + jQuery, + StickyKit + ) { "use strict"; @@ -254,7 +265,7 @@ define([ if (data.subscriber.length <= 0) { MailPoet.Notice.error( - MailPoetI18n.newsletterPreviewEmailMissing, + App.getConfig().get('translations.newsletterPreviewEmailMissing'), { positionAfter: $emailField, scroll: true, @@ -268,7 +279,7 @@ define([ CommunicationComponent.previewNewsletter(data).done(function(response) { if(response.result !== undefined && response.result === true) { - MailPoet.Notice.success(MailPoetI18n.newsletterPreviewSent, { scroll: true }); + MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'), { scroll: true }); } else { if (_.isArray(response.errors)) { response.errors.map(function(error) { @@ -276,7 +287,7 @@ define([ }); } else { MailPoet.Notice.error( - MailPoetI18n.newsletterPreviewFailedToSend, + App.getConfig().get('translations.newsletterPreviewFailedToSend'), { scroll: true, static: true, diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html index e6ccfcb1f2..af2d61a26a 100644 --- a/views/newsletter/editor.html +++ b/views/newsletter/editor.html @@ -1256,6 +1256,7 @@ validation: { validateUnsubscribeLinkPresent: true, // TODO: Add validation based on whether Mailpoet MTA is used or not }, + translations: MailPoetI18n, urls: { send: '<%= admin_url('admin.php?page=mailpoet-newsletters#/send/' ~ params('id')) %>', imageMissing: '<%= image_url(