diff --git a/assets/js/src/newsletters/breadcrumb.jsx b/assets/js/src/newsletters/breadcrumb.jsx index 72442bd5d8..f32cadb44d 100644 --- a/assets/js/src/newsletters/breadcrumb.jsx +++ b/assets/js/src/newsletters/breadcrumb.jsx @@ -21,20 +21,20 @@ define( steps: [ { name: 'type', - label: MailPoetI18n.selectType, + label: 'Select type', link: '/new' }, { name: 'template', - label: MailPoetI18n.template + label: 'Template' }, { name: 'editor', - label: MailPoetI18n.designer + label: 'Designer' }, { name: 'send', - label: MailPoetI18n.send + label: 'Send' } ] }; @@ -73,4 +73,4 @@ define( return Breadcrumb; } -); +); \ No newline at end of file diff --git a/assets/js/src/newsletters/list.jsx b/assets/js/src/newsletters/list.jsx index 98abc189e0..01616eac8a 100644 --- a/assets/js/src/newsletters/list.jsx +++ b/assets/js/src/newsletters/list.jsx @@ -258,4 +258,4 @@ define( return NewsletterList; } -); +); \ No newline at end of file diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx index fbc6327e11..0315bbb73c 100644 --- a/assets/js/src/newsletters/send.jsx +++ b/assets/js/src/newsletters/send.jsx @@ -196,4 +196,4 @@ define( return NewsletterSend; } -); +); \ No newline at end of file diff --git a/assets/js/src/newsletters/templates.jsx b/assets/js/src/newsletters/templates.jsx index 41c054d894..041033e8fb 100644 --- a/assets/js/src/newsletters/templates.jsx +++ b/assets/js/src/newsletters/templates.jsx @@ -54,7 +54,7 @@ define( try { saveTemplate(JSON.parse(e.target.result)); } catch (err) { - MailPoet.Notice.error(MailPoetI18n.templateMalformed); + MailPoet.Notice.error('This template file appears to be malformed. Please try another one.'); } }.bind(this); @@ -63,15 +63,15 @@ define( render: function() { return (
-

{MailPoetI18n.importTemplate}

+

Import a template

- +

+ value="Upload" />

@@ -108,9 +108,9 @@ define( response = [ { name: - MailPoetI18n.mailpoetGuide, + "MailPoet's Guide", description: - MailPoetI18n.mailpoetGuideDescription, + "This is the standard template that comes with MailPoet.", readonly: "1" } ] @@ -155,9 +155,7 @@ define( this.setState({ loading: true }); if( window.confirm( - ( - MailPoetI18n.confirmTemplateDeletion - ).replace('%$1s', template.name) + 'You are about to delete the template named "'+ template.name +'"' ) ) { MailPoet.Ajax.post({ @@ -189,7 +187,7 @@ define( href="javascript:;" onClick={ this.handleDeleteTemplate.bind(null, template) } > - {MailPoetI18n.delete} + Delete ), thumbnail = ''; @@ -220,7 +218,7 @@ define( className="button button-primary" onClick={ this.handleSelectTemplate.bind(null, template) } > - {MailPoetI18n.select} + Select   - {MailPoetI18n.preview} + Preview { (template.readonly === "1") ? false : deleteLink } @@ -244,7 +242,7 @@ define( return (
-

{MailPoetI18n.selectTemplate}

+

Select a template

diff --git a/assets/js/src/newsletters/types.jsx b/assets/js/src/newsletters/types.jsx index 649bb71476..351e58e3a9 100644 --- a/assets/js/src/newsletters/types.jsx +++ b/assets/js/src/newsletters/types.jsx @@ -26,7 +26,7 @@ define( action: 'create', data: { type: type, - subject: MailPoetI18n.draftNewsletter, + subject: 'Draft newsletter', } }).done(function(response) { if(response.result && response.newsletter.id) { @@ -43,7 +43,7 @@ define( render: function() { return (
-

{MailPoetI18n.pickCampaignType}

+

Pick a type of campaign

@@ -52,9 +52,10 @@ define(
-

{MailPoetI18n.standardNewsletter}

+

Newsletter

- {MailPoetI18n.standardNewsletterDescription} + Send a newsletter with images, buttons, dividers, + and social bookmarks. Or a simple email.

@@ -63,7 +64,7 @@ define( className="button button-primary" onClick={ this.createNewsletter.bind(null, 'standard') } > - {MailPoetI18n.create} + Create
@@ -72,9 +73,9 @@ define(
-

{MailPoetI18n.welcomeEmail}

+

Welcome email

- {MailPoetI18n.welcomeEmailDescription} + Send an email for new users.

@@ -83,7 +84,7 @@ define( className="button button-primary" onClick={ this.setupNewsletter.bind(null, 'welcome') } > - {MailPoetI18n.setUp} + Set up
@@ -92,9 +93,9 @@ define(
-

{MailPoetI18n.postNotificationsNewsletter}

+

Post notifications

- {MailPoetI18n.postNotificationsNewsletterDescription} + Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.

@@ -103,7 +104,7 @@ define( className="button button-primary" onClick={ this.setupNewsletter.bind(null, 'notification') } > - {MailPoetI18n.setUp} + Set up diff --git a/assets/js/src/newsletters/types/notification.jsx b/assets/js/src/newsletters/types/notification.jsx index fe461ee40a..92f1606cd1 100644 --- a/assets/js/src/newsletters/types/notification.jsx +++ b/assets/js/src/newsletters/types/notification.jsx @@ -25,11 +25,11 @@ define( var intervalField = { name: 'interval', values: { - 'daily': MailPoetI18n.intervalOnceADay, - 'weekly': MailPoetI18n.intervalWeekly, - 'monthly': MailPoetI18n.intervalMonthly, - 'nthWeekDay': MailPoetI18n.intervalMonthlyEvery, - 'immediately': MailPoetI18n.intervalImmediately, + 'daily': 'Once a day at...', + 'weekly': 'Weekly on...', + 'monthly': 'Monthly on the...', + 'nthWeekDay': 'Monthly every...', + 'immediately': 'Immediately.', }, }; @@ -53,13 +53,13 @@ define( var weekDayField = { name: 'weekDay', values: { - 0: MailPoetI18n.monday, - 1: MailPoetI18n.tuesday, - 2: MailPoetI18n.wednesday, - 3: MailPoetI18n.thursday, - 4: MailPoetI18n.friday, - 5: MailPoetI18n.saturday, - 6: MailPoetI18n.sunday, + 0: 'Monday', + 1: 'Tuesday', + 2: 'Wednesday', + 3: 'Thursday', + 4: 'Friday', + 5: 'Saturday', + 6: 'Sunday', }, }; @@ -69,13 +69,14 @@ define( values: _.object(_.map( _.times(NUMBER_OF_DAYS_IN_MONTH, function(day) { return day; }), function(day) { - var label; - if (day === 0) label = MailPoetI18n.first; - else if (day === 1) label = MailPoetI18n.second; - else if (day === 2) label = MailPoetI18n.third; - else label = MailPoetI18n.nth.replace('%$1d', (day + 1)); + var suffixes = { + 0: 'st', + 1: 'nd', + 2: 'rd' + }; + var suffix = suffixes[day] || 'th'; - return [day, label]; + return [day, (day + 1).toString() + suffix]; }, )), }; @@ -83,10 +84,10 @@ define( var nthWeekDayField = { name: 'nthWeekDay', values: { - '0': MailPoetI18n.first, - '1': MailPoetI18n.second, - '2': MailPoetI18n.third, - '3': MailPoetI18n.last, + '0': '1st', + '1': '2nd', + '2': '3rd', + '3': 'last', }, }; @@ -196,7 +197,7 @@ define( return (
-

{MailPoetI18n.postNotificationsNewsletter}

+

Post notifications