Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Replace editor translations with Twig localize function

Browse Source
This commit is contained in:
Tautvidas Sipavičius
2016-03-07 15:42:12 +02:00
parent 88a00bc38c
commit c3416977bb
7 changed files with 120 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletter_editor/blocks/footer.js
View File

@@ -79,7 +79,7 @@ define([
},
mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(),
mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'),
mailpoet_custom_fields_window_title: MailPoetI18n.customFieldsWindowTitle,
});
},
});

2
assets/js/src/newsletter_editor/blocks/header.js
View File

@@ -79,7 +79,7 @@ define([
},
mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(),
mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'),
mailpoet_custom_fields_window_title: MailPoetI18n.customFieldsWindowTitle,
});
},
});

2
assets/js/src/newsletter_editor/blocks/text.js
View File

@@ -77,7 +77,7 @@ define([
},
mailpoet_custom_fields: App.getConfig().get('customFields').toJSON(),
mailpoet_custom_fields_window_title: App.getConfig().get('translations.customFieldsWindowTitle'),
mailpoet_custom_fields_window_title: MailPoetI18n.customFieldsWindowTitle,
});
}
},

1
assets/js/src/newsletter_editor/components/config.js
View File

@@ -10,7 +10,6 @@ define([
availableStyles: {},
socialIcons: {},
blockDefaults: {},
translations: {},
sidepanelWidth: '331px',
validation: {},
urls: {},

14
assets/js/src/newsletter_editor/components/save.js
View File

@@ -191,7 +191,7 @@ define([
if (templateName === '') {
MailPoet.Notice.error(
App.getConfig().get('translations.templateNameMissing'),
MailPoetI18n.templateNameMissing,
{
positionAfter: that.$el,
scroll: true,
@@ -199,7 +199,7 @@ define([
);
} else if (templateDescription === '') {
MailPoet.Notice.error(
App.getConfig().get('translations.templateDescriptionMissing'),
MailPoetI18n.templateDescriptionMissing,
{
positionAfter: that.$el,
scroll: true,
@@ -213,7 +213,7 @@ define([
}).done(function() {
console.log('Template saved', arguments);
MailPoet.Notice.success(
App.getConfig().get('translations.templateSaved'),
MailPoetI18n.templateSaved,
{
positionAfter: that.$el,
scroll: true,
@@ -222,7 +222,7 @@ define([
}).fail(function() {
console.log('Template save failed', arguments);
MailPoet.Notice.error(
App.getConfig().get('translations.templateSaveFailed'),
MailPoetI18n.templateSaveFailed,
{
positionAfter: that.$el,
scroll: true,
@@ -247,7 +247,7 @@ define([
if (templateName === '') {
MailPoet.Notice.error(
App.getConfig().get('translations.templateNameMissing'),
MailPoetI18n.templateNameMissing,
{
positionAfter: that.$el,
scroll: true,
@@ -255,7 +255,7 @@ define([
);
} else if (templateDescription === '') {
MailPoet.Notice.error(
App.getConfig().get('translations.templateDescriptionMissing'),
MailPoetI18n.templateDescriptionMissing,
{
positionAfter: that.$el,
scroll: true,
@@ -290,7 +290,7 @@ define([
if (App.getConfig().get('validation.validateUnsubscribeLinkPresent') &&
JSON.stringify(jsonObject).indexOf("[unsubscribeUrl]") < 0) {
this.showValidationError(App.getConfig().get('translations.unsubscribeLinkMissing'));
this.showValidationError(MailPoetI18n.unsubscribeLinkMissing);
return;
}

6
assets/js/src/newsletter_editor/components/sidebar.js
View File

@@ -256,7 +256,7 @@ define([
if (data.subscriber.length <= 0) {
MailPoet.Notice.error(
App.getConfig().get('translations.newsletterPreviewEmailMissing'),
MailPoetI18n.newsletterPreviewEmailMissing,
{
positionAfter: $emailField,
scroll: true,
@@ -270,7 +270,7 @@ define([
CommunicationComponent.previewNewsletter(data).done(function(response) {
if(response.result !== undefined && response.result === true) {
MailPoet.Notice.success(App.getConfig().get('translations.newsletterPreviewSent'), { scroll: true });
MailPoet.Notice.success(MailPoetI18n.newsletterPreviewSent, { scroll: true });
} else {
if (_.isArray(response.errors)) {
response.errors.map(function(error) {
@@ -278,7 +278,7 @@ define([
});
} else {
MailPoet.Notice.error(
App.getConfig().get('translations.newsletterPreviewFailedToSend'),
MailPoetI18n.newsletterPreviewFailedToSend,
{
scroll: true,
static: true,

227
views/newsletter/editor.html
View File

@@ -1,100 +1,5 @@
<% extends 'layout.html' %>
<% block content %>
<div id="mailpoet_editor">
<div id="mailpoet_editor_heading"></div>
<div class="mailpoet_breadcrumbs">
<%= __('Select type') %> &gt; <%= __('Template') %> &gt; <strong><%= __('Designer') %></strong> &gt; <%= __('Send') %>
</div>
<div class="clearfix"></div>
<div id="mailpoet_editor_main_wrapper">
<div id="mailpoet_editor_styles">
</div>
<div id="mailpoet_editor_sidebar"></div>
<div id="mailpoet_editor_content_container">
<div class="mailpoet_newsletter_wrapper">
<div id="mailpoet_editor_content"></div>
</div>
</div>
<div class="clear"></div>
</div>
<div id="mailpoet_editor_bottom">
</div>
</div>
<div class="mailpoet_layer_overlay" style="display:none;"></div>
<div id="wp-link-backdrop" style="display: none"></div>
<div
id="wp-link-wrap"
class="wp-core-ui search-panel-visible"
style="display: none"
>
<form id="wp-link" tabindex="-1">
<%= wp_nonce_field('internal-linking', '_ajax_linking_nonce', false) %>
<div id="link-modal-title">
<%= __('Insert/edit link') %>
<div id="wp-link-close" tabindex="0"></div>
</div>
<div id="link-selector">
<div id="link-options">
<div>
<label>
<span><%= __('Type') %></span>
<select id="url-type-field" name="urltype">
<option value="http://"><%= __('Link to a web page') %></option>
<option value="[viewInBrowserUrl]"><%= __('Browser version') %></option>
<option value="[unsubscribeUrl]"><%= __('Unsubcribe page') %></option>
<option value="[manageSubscriptionUrl]"><%= __('Manage your subscription page') %></option>
</select>
</label>
</div>
<div id="link-href-field">
<label><span><%= __('Link') %></span><input id="url-field" type="text" name="href" /></label>
</div>
<div class="mailpoet_hidden">
<label><span><%= __('Title') %></span><input id="link-title-field" type="text" name="linktitle" /></label>
</div>
<div class="link-target mailpoet_hidden">
<label><span>&nbsp;</span><input type="checkbox" id="link-target-checkbox" /> <%= __('Open link in a new window/tab') %></label>
</div>
</div>
<div id="search-panel">
<div class="link-search-wrapper">
<label>
<span class="search-label"><%= __('Search your content') %></span>
<input type="search" id="search-field" class="link-search-field" autocomplete="off" />
<span class="spinner"></span>
</label>
</div>
<div id="search-results" class="query-results">
<ul></ul>
<div class="river-waiting">
<span class="spinner"></span>
</div>
</div>
<div id="most-recent-results" class="query-results">
<div class="query-notice"><em><%= __('No search term specified. Showing recent items.') %></em></div>
<ul></ul>
<div class="river-waiting">
<span class="spinner"></span>
</div>
</div>
</div>
</div>
<div class="submitbox">
<div id="wp-link-update">
<input type="submit" value="<%= __('Add Link') %>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
</div>
<div id="wp-link-cancel">
<a class="submitdelete deletion" href="#"><%= __('Cancel') %></a>
</div>
</div>
</form>
</div>
<% endblock %>
<% block templates %>
<%= partial(
'newsletter_editor_template_tools_generic',
@@ -312,6 +217,112 @@
'newsletter_editor_template_sidebar_styles',
'newsletter/templates/components/sidebar/styles.hbs'
) %>
<% endblock %>
<% block content %>
<div id="mailpoet_editor">
<div id="mailpoet_editor_heading"></div>
<div class="mailpoet_breadcrumbs">
<%= __('Select type') %> &gt; <%= __('Template') %> &gt; <strong><%= __('Designer') %></strong> &gt; <%= __('Send') %>
</div>
<div class="clearfix"></div>
<div id="mailpoet_editor_main_wrapper">
<div id="mailpoet_editor_styles">
</div>
<div id="mailpoet_editor_sidebar"></div>
<div id="mailpoet_editor_content_container">
<div class="mailpoet_newsletter_wrapper">
<div id="mailpoet_editor_content"></div>
</div>
</div>
<div class="clear"></div>
</div>
<div id="mailpoet_editor_bottom">
</div>
</div>
<div class="mailpoet_layer_overlay" style="display:none;"></div>
<div id="wp-link-backdrop" style="display: none"></div>
<div
id="wp-link-wrap"
class="wp-core-ui search-panel-visible"
style="display: none"
>
<form id="wp-link" tabindex="-1">
<%= wp_nonce_field('internal-linking', '_ajax_linking_nonce', false) %>
<div id="link-modal-title">
<%= __('Insert/edit link') %>
<div id="wp-link-close" tabindex="0"></div>
</div>
<div id="link-selector">
<div id="link-options">
<div>
<label>
<span><%= __('Type') %></span>
<select id="url-type-field" name="urltype">
<option value="http://"><%= __('Link to a web page') %></option>
<option value="[viewInBrowserUrl]"><%= __('Browser version') %></option>
<option value="[unsubscribeUrl]"><%= __('Unsubcribe page') %></option>
<option value="[manageSubscriptionUrl]"><%= __('Manage your subscription page') %></option>
</select>
</label>
</div>
<div id="link-href-field">
<label><span><%= __('Link') %></span><input id="url-field" type="text" name="href" /></label>
</div>
<div class="mailpoet_hidden">
<label><span><%= __('Title') %></span><input id="link-title-field" type="text" name="linktitle" /></label>
</div>
<div class="link-target mailpoet_hidden">
<label><span>&nbsp;</span><input type="checkbox" id="link-target-checkbox" /> <%= __('Open link in a new window/tab') %></label>
</div>
</div>
<div id="search-panel">
<div class="link-search-wrapper">
<label>
<span class="search-label"><%= __('Search your content') %></span>
<input type="search" id="search-field" class="link-search-field" autocomplete="off" />
<span class="spinner"></span>
</label>
</div>
<div id="search-results" class="query-results">
<ul></ul>
<div class="river-waiting">
<span class="spinner"></span>
</div>
</div>
<div id="most-recent-results" class="query-results">
<div class="query-notice"><em><%= __('No search term specified. Showing recent items.') %></em></div>
<ul></ul>
<div class="river-waiting">
<span class="spinner"></span>
</div>
</div>
</div>
</div>
<div class="submitbox">
<div id="wp-link-update">
<input type="submit" value="<%= __('Add Link') %>" class="button button-primary" id="wp-link-submit" name="wp-link-submit">
</div>
<div id="wp-link-cancel">
<a class="submitdelete deletion" href="#"><%= __('Cancel') %></a>
</div>
</div>
</form>
</div>
<%= localize({
'customFieldsWindowTitle': __('Select a shortcode'),
'unsubscribeLinkMissing': __('All newsletters must include an "unsubscribe" link. Add a footer widget to your newsletter to continue.'),
'newsletterPreviewEmailMissing': __('Please enter an email where newsletter preview should be sent to.'),
'newsletterPreviewSent': __('Newsletter preview email has been successfully sent!'),
'newsletterPreviewFailedToSend': __('Attempt to send a newsletter preview email failed. Please verify that your sending method is configured correctly try again.'),
'templateNameMissing': __('Please add a template name'),
'templateDescriptionMissing': __('Please add a template description'),
'templateSaved': __('Template has been saved.'),
'templateSaveFailed': __('Template has not been saved, please try again.'),
}) %>
<%= javascript(
'vendor.js',
@@ -509,7 +520,6 @@
</script>
<script type="text/javascript">
var newsletter = {};
var config = {
availableStyles: {
textSizes: [
@@ -1237,26 +1247,6 @@
'<%= __('Custom fields') %>': <%= json_encode(customFields) %>,
<% endif %>
},
translations: {
customFieldsWindowTitle:
'<%= __('Select a shortcode') %>',
unsubscribeLinkMissing:
'<%= __('All newsletter must include an "unsubscribe" link. Add a footer widget to your newsletter to continue.') %>',
newsletterPreviewEmailMissing:
'<%= __('Please enter an email where newsletter preview should be sent to.') %>',
newsletterPreviewSent:
'<%= __('Newsletter preview email has been successfully sent!') %>',
newsletterPreviewFailedToSend:
'<%= __('Attempt to send a newsletter preview email failed. Please verify that your sending method is configured correctly try again.') %>',
templateNameMissing:
'<%= __('Please add a template name') %>',
templateDescriptionMissing:
'<%= __('Please add a template description') %>',
templateSaved:
'<%= __('Template has been saved.') %>',
templateSaveFailed:
'<%= __('Template has not been saved, please try again.') %>',
},
sidepanelWidth: '331px',
validation: {
validateUnsubscribeLinkPresent: true, // TODO: Add validation based on whether Mailpoet MTA is used or not
@@ -1269,15 +1259,12 @@
},
};
var editor = null;
MailPoet.Ajax.post({
endpoint: 'newsletters',
action: 'get',
data: <%= params('id') %>
}).done(function(newsletter) {
// start editor
editor = EditorApplication.start({
EditorApplication.start({
newsletter: newsletter,
config: config,
});