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

Revert "Extract text labels from React code for translation in twig views"

Browse Source 
This reverts commit 9aef6850c2.

Conflicts:
	views/newsletters.html
This commit is contained in:
Tautvidas Sipavičius
2016-03-17 15:24:07 +02:00
parent 0118b2472a
commit a099174226
9 changed files with 64 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/js/src/newsletters/breadcrumb.jsx
View File

@@ -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;
}
);
);

2
assets/js/src/newsletters/list.jsx
View File

@@ -258,4 +258,4 @@ define(
return NewsletterList;
}
);
);

2
assets/js/src/newsletters/send.jsx
View File

@@ -196,4 +196,4 @@ define(
return NewsletterSend;
}
);
);

24
assets/js/src/newsletters/templates.jsx
View File

@@ -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 (
<div>
<h2>{MailPoetI18n.importTemplate}</h2>
<h2>Import a template</h2>
<form onSubmit={this.handleSubmit}>
<input type="file" placeholder={MailPoetI18n.selectJsonFileToUpload} ref="templateFile" />
<input type="file" placeholder="Select a .json file to upload" ref="templateFile" />
<p className="submit">
<input
className="button button-primary"
type="submit"
value={MailPoetI18n.upload} />
value="Upload" />
</p>
</form>
</div>
@@ -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
</a>
</div>
), thumbnail = '';
@@ -220,7 +218,7 @@ define(
className="button button-primary"
onClick={ this.handleSelectTemplate.bind(null, template) }
>
{MailPoetI18n.select}
Select
</a>
&nbsp;
<a
@@ -228,7 +226,7 @@ define(
className="button button-secondary"
onClick={ this.handlePreviewTemplate.bind(null, template) }
>
{MailPoetI18n.preview}
Preview
</a>
</div>
{ (template.readonly === "1") ? false : deleteLink }
@@ -244,7 +242,7 @@ define(
return (
<div>
<h1>{MailPoetI18n.selectTemplate}</h1>
<h1>Select a template</h1>
<Breadcrumb step="template" />

23
assets/js/src/newsletters/types.jsx
View File

@@ -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 (
<div>
<h1>{MailPoetI18n.pickCampaignType}</h1>
<h1>Pick a type of campaign</h1>
<Breadcrumb step="type" />
@@ -52,9 +52,10 @@ define(
<div className="mailpoet_thumbnail"></div>
<div className="mailpoet_description">
<h3>{MailPoetI18n.standardNewsletter}</h3>
<h3>Newsletter</h3>
<p>
{MailPoetI18n.standardNewsletterDescription}
Send a newsletter with images, buttons, dividers,
and social bookmarks. Or a simple email.
</p>
</div>
@@ -63,7 +64,7 @@ define(
className="button button-primary"
onClick={ this.createNewsletter.bind(null, 'standard') }
>
{MailPoetI18n.create}
Create
</a>
</div>
</li>
@@ -72,9 +73,9 @@ define(
<div className="mailpoet_thumbnail"></div>
<div className="mailpoet_description">
<h3>{MailPoetI18n.welcomeEmail}</h3>
<h3>Welcome email</h3>
<p>
{MailPoetI18n.welcomeEmailDescription}
Send an email for new users.
</p>
</div>
@@ -83,7 +84,7 @@ define(
className="button button-primary"
onClick={ this.setupNewsletter.bind(null, 'welcome') }
>
{MailPoetI18n.setUp}
Set up
</a>
</div>
</li>
@@ -92,9 +93,9 @@ define(
<div className="mailpoet_thumbnail"></div>
<div className="mailpoet_description">
<h3>{MailPoetI18n.postNotificationsNewsletter}</h3>
<h3>Post notifications</h3>
<p>
{MailPoetI18n.postNotificationsNewsletterDescription}
Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.
</p>
</div>
@@ -103,7 +104,7 @@ define(
className="button button-primary"
onClick={ this.setupNewsletter.bind(null, 'notification') }
>
{MailPoetI18n.setUp}
Set up
</a>
</div>
</li>

49
assets/js/src/newsletters/types/notification.jsx
View File

@@ -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 (
<div>
<h1>{MailPoetI18n.postNotificationsNewsletter}</h1>
<h1>Post notifications</h1>
<Breadcrumb step="type" />
<Select
@@ -214,7 +215,7 @@ define(
className="button button-primary"
type="button"
onClick={ this.handleNext }
value={MailPoetI18n.next} />
value="Next" />
</p>
</div>
);

2
assets/js/src/newsletters/types/standard.jsx
View File

@@ -47,7 +47,7 @@ define(
render: function() {
return (
<div>
<h1>{MailPoetI18n.standardNewsletter}</h1>
<h1>Newsletter</h1>
<Breadcrumb step="type" />
</div>
);

16
assets/js/src/newsletters/types/welcome.jsx
View File

@@ -28,8 +28,8 @@ define(
var events = {
name: 'event',
values: {
'segment': MailPoetI18n.whenSomeoneSubscribesToList,
'user': MailPoetI18n.whenWordpressUserIsAdded,
'segment': 'When someone subscribes to the list...',
'user': 'When a new Wordrpess user is added to your site...',
}
};
@@ -57,10 +57,10 @@ define(
var afterTimeTypeField = {
name: 'afterTimeType',
values: {
'immediate': MailPoetI18n.delayImmediately,
'hours': MailPoetI18n.delayHoursAfter,
'days': MailPoetI18n.delayDaysAfter,
'weeks': MailPoetI18n.delayWeeksAfter,
'immediate': 'immediately',
'hours': 'hour(s) after',
'days': 'day(s) after',
'weeks': 'week(s) after',
}
};
@@ -152,7 +152,7 @@ define(
}
return (
<div>
<h1>{MailPoetI18n.welcomeEmail}</h1>
<h1>Welcome email</h1>
<Breadcrumb step="type" />
<h3>{MailPoetI18n.selectEventToSendWelcomeEmail}</h3>
@@ -176,7 +176,7 @@ define(
className="button button-primary"
type="button"
onClick={ this.handleNext }
value={MailPoetI18n.next} />
value="Next" />
</p>
</div>
);