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

June 8 2016 Copy review

Browse Source
This commit is contained in:
Kiefer Covia
2016-06-08 17:02:50 +02:00
parent a355228b93
commit 08e6430c7d
25 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php
View File

@ -46,7 +46,7 @@ class FranksRoastHouseTemplate {
"blocks" => array(
array(
"type" => "header",
"text" => __("Display problems?&nbsp;<a href=\"[link:newsletter_view_in_browser_url]\">View it in your browser</a>"),
"text" => __("<a href=\"[link:newsletter_view_in_browser_url]\">Open this email in your web browser.</a>"),
"styles" => array(
"block" => array(
"backgroundColor" => "#ccc6c6"
@ -67,7 +67,7 @@ class FranksRoastHouseTemplate {
"type" => "image",
"link" => "http://www.example.com",
"src" => $this->template_image_url . "/header-v2.jpg",
"alt" => __("Frank's Roast House"),
"alt" => __("Frank's Café"),
"fullWidth" => true,
"width" => "600px",
"height" => "220px",
@ -88,7 +88,7 @@ class FranksRoastHouseTemplate {
),
array(
"type" => "text",
"text" => __("<p>Hello there&nbsp;[user:firstname | default:Coffee Drinker]</p>\n<p></p>\n<p>Sit back&nbsp;and enjoy a cup of joe as you have a read of our latest newsletter.&nbsp;</p>")
"text" => __("<p>Hi there&nbsp;[user:firstname | default:coffee drinker]</p>\n<p></p>\n<p>Sit back&nbsp;and enjoy your favorite roast as you read this week's newsletter.&nbsp;</p>")
),
array(
"type" => "image",
@ -106,7 +106,7 @@ class FranksRoastHouseTemplate {
),
array(
"type" => "text",
"text" => __("<h1 style=\"text-align: center;\">--- Guest Coffee: <em>Brew Bros. ---</em></h1>\n<p><em></em></p>\n<p>Pop into our North Avenue store to try our latest guest coffee from independent coffee roasters, Brew Bros. This young duo only started creating their own blends two years ago, but have quickly gained&nbsp;popularity through a number of pop-up events and collaborations with local street food vendors.</p>\n<p></p>\n<blockquote>\n<p><span style=\"color: #ff6600;\"><em>Tasting notes: A rich, caramel flavour with subtle overtones of molasses. The perfect wake-up morning espresso.</em></span></p>\n</blockquote>")
"text" => __("<h1 style=\"text-align: center;\">--- Guest Coffee Roaster: <em>Brew Bros. ---</em></h1>\n<p><em></em></p>\n<p>Visit our Center Avenue store to try the latest guest coffee from Brew Bros, a local coffee roaster. This young duo started only two years ago, but have quickly gained&nbsp;popularity through pop-up shops, local events, and collaborations with food trucks.</p>\n<p></p>\n<blockquote>\n<p><span style=\"color: #ff6600;\"><em>Tasting notes: A rich, caramel flavor with subtle hints of molasses. The perfect wake-up morning espresso!</em></span></p>\n</blockquote>")
)
)
)
@ -150,7 +150,7 @@ class FranksRoastHouseTemplate {
),
array(
"type" => "text",
"text" => __("<p>We're offering free lunch for a month if you can invent a new sandwich to go on our menu.</p>\n<p></p>\n<p></p>\n<p>Simply tweet your ideas to <a href=\"http://www.example.com\" title=\"This isn't a real twitter account\">@franksroasthouse</a> and use #sandwichcomp and we'll let you know if you're a winner.</p>")
"text" => __("<p>Have an idea for the Next Great Sandwich? Tell us! We're offering free lunch for a month if you can invent an awesome new sandwich for our menu.</p>\n<p></p>\n<p></p>\n<p>Simply tweet your ideas to <a href=\"http://www.example.com\" title=\"This isn't a real twitter account\">@franksroasthouse</a> and use #sandwichcomp and we'll let you know if you're a winner.</p>")
),
array(
"type" => "button",
@ -175,7 +175,7 @@ class FranksRoastHouseTemplate {
),
array(
"type" => "text",
"text" => __("<h3 style=\"text-align: center;\">Follow us</h3>")
"text" => __("<h3 style=\"text-align: center;\">Follow Us</h3>")
),
array(
"type" => "social",
@ -250,11 +250,11 @@ class FranksRoastHouseTemplate {
),
array(
"type" => "text",
"text" => __("<p>Watch out Westville Street, we're coming to you very soon!&nbsp;</p>\n<p></p>\n<p>Keep an eye on your mailboxes, we'll have some special offers for our email subscribers and an exclusive Preview Evening invite.<br /><br /></p>")
"text" => __("<p>Watch out Broad Street, we're coming to you very soon!&nbsp;</p>\n<p></p>\n<p>Keep an eye on your inbox, as we'll have some special offers for our email subscribers plus an exclusive launch party invite!<br /><br /></p>")
),
array(
"type" => "text",
"text" => __("<h2>We're Now Open Longer</h2>\n<p></p>\n<p>That's right, Franks is now open for even longer, so you can get your caffeine fix almost any time of the day! Here's our new opening hours:</p>\n<p></p>\n<ul>\n<li>Monday - Thursday: 6am - 12am</li>\n<li>Friday - Saturday: 6am - 1:30am</li>\n<li>Sunday: 7:30am - 11pm</li>\n</ul>")
"text" => __("<h2>New and Improved Hours!</h2>\n<p></p>\n<p>Frank's is now open even later, so you can get your caffeine fix all day long! Here's our new opening hours:</p>\n<p></p>\n<ul>\n<li>Monday - Thursday: 6am - 12am</li>\n<li>Friday - Saturday: 6am - 1:30am</li>\n<li>Sunday: 7:30am - 11pm</li>\n</ul>")
)
)
)

2
lib/Config/Shortcodes.php
View File

@ -114,7 +114,7 @@ class Shortcodes {
function renderArchiveSubject($newsletter) {
return '<a href="TODO" target="_blank" title="'
.esc_attr(__('Preview in new tab')).'">'
.esc_attr(__('Preview in a new tab')).'">'
.esc_attr($newsletter->subject).
'</a>';
}

2
lib/Cron/CronHelper.php
View File

@ -72,7 +72,7 @@ class CronHelper {
static function checkExecutionTimer($timer) {
$elapsed_time = microtime(true) - $timer;
if($elapsed_time >= self::DAEMON_EXECUTION_LIMIT) {
throw new \Exception(__('Maximum execution time reached.'));
throw new \Exception(__('Maximum execution time has been reached.'));
}
}
}

2
lib/Cron/Daemon.php
View File

@ -20,7 +20,7 @@ class Daemon {
private $timer;
function __construct($data) {
if(empty($data)) $this->abortWithError(__('Invalid or missing cron data.'));
if(empty($data)) $this->abortWithError(__('Invalid or missing Cron data.'));
ignore_user_abort();
$this->daemon = CronHelper::getDaemon();
$this->token = CronHelper::createToken();

2
lib/Cron/Workers/SendingQueue.php
View File

@ -359,7 +359,7 @@ class SendingQueue {
if($this->mta_log['sent'] === $frequency_limit &&
$elapsed_time <= $frequency_interval
) {
throw new \Exception(__('Sending frequency limit reached.'));
throw new \Exception(__('Sending frequency limit has been reached.'));
}
if($elapsed_time > $frequency_interval) {
$this->mta_log = array(

8
lib/Form/Block/Base.php
View File

@ -7,7 +7,7 @@ abstract class Base {
if($block['id'] === 'email') {
$rules['required'] = true;
$rules['error-message'] = __('You need to specify a valid email address');
$rules['error-message'] = __('Please specify a valid email address');
}
if($block['id'] === 'segments') {
@ -15,7 +15,7 @@ abstract class Base {
$rules['mincheck'] = 1;
$rules['group'] = $block['id'];
$rules['errors-container'] = '.mailpoet_error_'.$block['id'];
$rules['required-message'] = __('You need to select a list');
$rules['required-message'] = __('Please select a list');
}
if(!empty($block['params']['required'])) {
@ -25,7 +25,7 @@ abstract class Base {
if(!empty($block['params']['validate'])) {
if($block['params']['validate'] === 'phone') {
$rules['pattern'] = "^[\d\+\-\.\(\)\/\s]*$";
$rules['error-message'] = __('You need to specify a valid phone number');
$rules['error-message'] = __('Please specify a valid phone number');
} else {
$rules['type'] = $block['params']['validate'];
}
@ -34,7 +34,7 @@ abstract class Base {
if(in_array($block['type'], array('radio', 'checkbox'))) {
$rules['group'] = 'custom_field_'.$block['id'];
$rules['errors-container'] = '.mailpoet_error_'.$block['id'];
$rules['required-message'] = __('You need to select at least one option.');
$rules['required-message'] = __('Please select at least one option.');
}
$validation = array();

2
lib/Form/Widget.php
View File

@ -40,7 +40,7 @@ class Widget extends \WP_Widget {
$instance = wp_parse_args(
(array)$instance,
array(
'title' => __("Subscribe to our Newsletter")
'title' => __("Subscribe to Our Newsletter")
)
);

4
lib/Models/CustomField.php
View File

@ -9,10 +9,10 @@ class CustomField extends Model {
function __construct() {
parent::__construct();
$this->addValidations('name', array(
'required' => __('You need to specify a name.')
'required' => __('Please specify a name.')
));
$this->addValidations('type', array(
'required' => __('You need to specify a type.')
'required' => __('Please specify a type.')
));
}

2
lib/Models/Form.php
View File

@ -10,7 +10,7 @@ class Form extends Model {
parent::__construct();
$this->addValidations('name', array(
'required' => __('You need to specify a name.')
'required' => __('Please specify a name.')
));
}

4
lib/Models/Newsletter.php
View File

@ -12,7 +12,7 @@ class Newsletter extends Model {
parent::__construct();
$this->addValidations('type', array(
'required' => __('You need to specify a type.')
'required' => __('Please specify a type.')
));
}
@ -131,7 +131,7 @@ class Newsletter extends Model {
$segments = Segment::orderByAsc('name')->findMany();
$segment_list = array();
$segment_list[] = array(
'label' => __('All lists'),
'label' => __('All Lists'),
'value' => ''
);

4
lib/Models/NewsletterOptionField.php
View File

@ -9,10 +9,10 @@ class NewsletterOptionField extends Model {
function __construct() {
parent::__construct();
$this->addValidations('name', array(
'required' => __('You need to specify a name.')
'required' => __('Please specify a name.')
));
$this->addValidations('newsletter_type', array(
'required' => __('You need to specify a newsletter type.')
'required' => __('Please specify a newsletter type.')
));
}

4
lib/Models/NewsletterTemplate.php
View File

@ -10,10 +10,10 @@ class NewsletterTemplate extends Model {
parent::__construct();
$this->addValidations('name', array(
'required' => __('You need to specify a name.')
'required' => __('Please specify a name.')
));
$this->addValidations('body', array(
'required' => __('Template body cannot be empty.')
'required' => __('The template body cannot be empty.')
));
}

6
lib/Models/Segment.php
View File

@ -10,7 +10,7 @@ class Segment extends Model {
parent::__construct();
$this->addValidations('name', array(
'required' => __('You need to specify a name.')
'required' => __('Please specify a name.')
));
}
@ -102,7 +102,7 @@ class Segment extends Model {
$wp_segment->hydrate(array(
'name' => __('WordPress Users'),
'description' =>
__('The list containing all of your WordPress users.'),
__('This lists containts all of your WordPress users.'),
'type' => 'wp_users'
));
$wp_segment->save();
@ -171,7 +171,7 @@ class Segment extends Model {
'AND relation.status = "' . Subscriber::STATUS_SUBSCRIBED . '" ' .
'GROUP BY segments.id) ' .
'UNION ALL ' .
'(SELECT 0 as id, "' . __('Not In List') . '" as name, COUNT(*) as subscribers ' .
'(SELECT 0 as id, "' . __('Not in a List') . '" as name, COUNT(*) as subscribers ' .
'FROM ' . MP_SUBSCRIBERS_TABLE . ' subscribers ' .
'LEFT JOIN ' . MP_SUBSCRIBER_SEGMENT_TABLE . ' relation on relation.subscriber_id = subscribers.id ' .
(($withConfirmedSubscribers) ?

4
lib/Models/Setting.php
View File

@ -17,7 +17,7 @@ class Setting extends Model {
parent::__construct();
$this->addValidations('name', array(
'required' => __('You need to specify a name.')
'required' => __('Please specify a name.')
));
}
@ -41,7 +41,7 @@ class Setting extends Model {
'signup_confirmation' => array(
'enabled' => true,
'subject' => sprintf(__('Confirm your subscription to %1$s'), get_option('blogname')),
'body' => __("Hello!\n\nHurray! You've subscribed to our site.\n\nWe need you to activate your subscription to the list(s): [lists_to_confirm] by clicking the link below: \n\n[activation_link]Click here to confirm your subscription.[/activation_link]\n\nThank you,\n\nThe team!")
'body' => __("Hello!\n\nHurray! You've subscribed to our site.\n\nPlease confirm your subscription to the list(s): [lists_to_confirm] by clicking the link below: \n\n[activation_link]Click here to confirm your subscription.[/activation_link]\n\nThank you,\n\nThe team!")
)
);
}

2
lib/Models/Subscriber.php
View File

@ -18,7 +18,7 @@ class Subscriber extends Model {
parent::__construct();
$this->addValidations('email', array(
'required' => __('You need to enter your email address.'),
'required' => __('Please enter your email address.'),
'isEmail' => __('Your email address is invalid.')
));
}

12
lib/Newsletter/Shortcodes/ShortcodesHelper.php
View File

@ -21,11 +21,11 @@ class ShortcodesHelper {
'shortcode' => 'subscriber:email',
),
array(
'text' => __('Wordpress user display name'),
'text' => __('Wordpress User Display Name'),
'shortcode' => 'subscriber:displayname | default:member',
),
array(
'text' => __('Total of subscribers'),
'text' => __('Total Number of Subscribers'),
'shortcode' => 'subscriber:count',
)
),
@ -37,15 +37,15 @@ class ShortcodesHelper {
),
__('Post Notifications') => array(
array(
'text' => __('Total number of posts or pages'),
'text' => __('Total Number of Posts or Pages'),
'shortcode' => 'newsletter:total',
),
array(
'text' => __('Latest post title'),
'text' => __('Most Recent Post Title'),
'shortcode' => 'newsletter:post_title',
),
array(
'text' => __('Issue number'),
'text' => __('Issue Number'),
'shortcode' => 'newsletter:number',
)
),
@ -55,7 +55,7 @@ class ShortcodesHelper {
'shortcode' => 'date:d',
),
array(
'text' => __('Current day of the month in ordinal, ie. 2nd, 3rd, etc.'),
'text' => __('Current day of the month in ordinal form, i.e. 2nd, 3rd, 4th, etc.'),
'shortcode' => 'date:dordinal',
),
array(

2
lib/Router/Forms.php
View File

@ -68,7 +68,7 @@ class Forms {
),
'settings' => array(
'on_success' => 'message',
'success_message' => __('Check your inbox or spam folder now to confirm your subscription.'),
'success_message' => __('Check your inbox or spam folder to confirm your subscription.'),
'segments' => null,
'segments_selected_by' => 'admin'
)

2
lib/Router/SendingQueue.php
View File

@ -70,7 +70,7 @@ class SendingQueue {
return array(
'result' => true,
'data' => array(
'message' => __('Your post notifications is activated.')
'message' => __('Your post notifications are activated.')
)
);
}

2
lib/Router/Subscribers.php
View File

@ -79,7 +79,7 @@ class Subscribers {
unset($data['segments']);
if(empty($segment_ids)) {
$errors[] = __('You need to select a list');
$errors[] = __('Please select a list');
}
if(!empty($errors)) {

4
lib/Subscribers/ImportExport/Import/MailChimp.php
View File

@ -132,7 +132,7 @@ class MailChimp {
function processError($error) {
switch ($error) {
case 'API':
$errorMessage = __('Invalid API key.');
$errorMessage = __('Invalid API Key.');
break;
case 'connection':
$errorMessage = __('Could not connect to your MailChimp account.');
@ -141,7 +141,7 @@ class MailChimp {
$errorMessage = __('The selected lists do not have matching columns (headers).');
break;
case 'size':
$errorMessage = __('Information received from MailChimp is too large for processing. Please limit the number of lists.');
$errorMessage = __('The information received from MailChimp is too large for processing. Please limit the number of lists.');
break;
case 'subscribers':
$errorMessage = __('Did not find any active subscribers.');

2
lib/Subscription/Comment.php
View File

@ -20,7 +20,7 @@ class Comment {
static function getSubscriptionField() {
$label = Setting::getValue(
'subscribe.on_comment.label',
__('Yes, add me to your mailing list.')
__('Yes, please add me to your mailing list.')
);
return '<p class="comment-form-mailpoet">

6
lib/Subscription/Pages.php
View File

@ -174,7 +174,7 @@ class Pages {
}, $this->subscriber->segments()->findMany());
if(empty($segment_names)) {
$title = __("You've subscribed!");
$title = __("You're now subscribed!");
} else {
$title = sprintf(
__("You've subscribed to: %s"),
@ -193,7 +193,7 @@ class Pages {
private function getUnsubscribeTitle() {
if($this->isPreview() || $this->subscriber !== false) {
return __("You've successfully unsubscribed");
return __("You are now unsubscribed");
}
}
@ -354,7 +354,7 @@ class Pages {
private function getUnsubscribeContent() {
$content = '';
if($this->isPreview() || $this->subscriber !== false) {
$content .= '<p>'.__('You made a mistake?').' <strong>';
$content .= '<p>'.__('Accidentally unsubscribed?').' <strong>';
$content .= '[mailpoet_manage]';
$content .= '</strong></p>';
}

2
lib/Subscription/Registration.php
View File

@ -8,7 +8,7 @@ class Registration {
static function extendForm() {
$label = Setting::getValue(
'subscribe.on_register.label',
__('Yes, add me to your mailing list.')
__('Yes, please add me to your mailing list.')
);
print '<p class="registration-form-mailpoet">

2
lib/Util/Permissions.php
View File

@ -7,7 +7,7 @@ class Permissions {
'mailpoet_newsletters' =>
__('Who can create newsletters?'),
'mailpoet_newsletter_styles' =>
__('Who can see the styles tab in the visual editor?'),
__('Who can see the Styles tab in the visual editor?'),
'mailpoet_subscribers' =>
__('Who can manage subscribers?'),
'mailpoet_settings' =>

26
views/form/editor.html
View File

@ -3,12 +3,12 @@
<% block title %>
<h1 class="title">
<%= __('Form') %>
<a class="page-title-action" href="?page=mailpoet-forms#/"><%= __('Back to list') %></a>
<a class="page-title-action" href="?page=mailpoet-forms#/"><%= __('Back to List') %></a>
</h1>
<h2>
<input
type="text"
placeholder="<%= __('Click to change the name!') %>"
placeholder="<%= __('Click here to change the name!') %>"
id="mailpoet_form_name"
value="<%= form.name %>"
/>
@ -47,14 +47,14 @@
<div id="mailpoet_settings_segment_selection">
<!-- Form settings: list selection -->
<p>
<strong><%= __('This form adds subscribers to these lists:') %></strong>
<strong><%= __('This form adds the subscribers to these lists:') %></strong>
</p>
<select
id="mailpoet_form_segments"
name="segments"
data-placeholder="<%= __('Choose a list') %>"
data-placeholder="<%= __('Please choose a list') %>"
multiple
data-parsley-required-message="<%= __('You need to select a list.') %>"
data-parsley-required-message="<%= __('Please select a list.') %>"
required
>
<% for segment in segments %>
@ -86,14 +86,14 @@
<% if(form.settings.on_success == 'page') %>
checked="checked"
<% endif %>
/><%= __('Go to page') %>
/><%= __('Go to Page') %>
</label>
</p>
<!-- default success message -->
<% if form.settings.success_message %>
<% set success_message = form.settings.success_message %>
<% else %>
<% set success_message = __('Check your inbox now to confirm your subscription.') %>
<% set success_message = __('Check your inbox to confirm your subscription.') %>
<% endif %>
<p
@ -128,7 +128,7 @@
<div>
<!-- Form export links -->
<p>
<%= __("Add this form to your sidebar or footer in the [link]Widgets[/link].")
<%= __("Add this form to your sidebar or footer on the [link]Widgets page[/link].")
| replace({
'[link]': '<a href="widgets.php" target="_blank">',
'[/link]': '</a>'
@ -137,7 +137,7 @@
%>
</p>
<p>
<%= __("Copy and paste this [link]shortcode[/link] into a post or page alternatively.")
<%= __("Copy and paste this [link]shortcode[/link] into a post or page.")
| replace({
'[link]': '<a href="javascript:;" class="mailpoet_form_export_toggle" data-type="shortcode">',
'[/link]': '</a>'
@ -146,7 +146,7 @@
%>
</p>
<p>
<%= __('%sHTML%s, %sPHP%s and %siframe%s versions are also available.', 'wysija-newsletters')
<%= __('%sHTML%s, %sPHP%s and %siFrame%s versions are also available.', 'wysija-newsletters')
| format(
'<a href="javascript:;" class="mailpoet_form_export_toggle" data-type="html">',
'</a>',
@ -254,7 +254,7 @@
name: "<%= __('Random text or HTML') %>",
type: 'html',
params: {
text: "<%= __('Subscribe to our newsletter and join our [mailpoet_subscribers_count] subscribers.') %>"
text: "<%= __('Subscribe to our newsletter and join [mailpoet_subscribers_count] other subscribers.') %>"
},
multiple: true,
readonly: true
@ -494,7 +494,7 @@
MailPoet.Notice.error(response.errors.join('<br />'));
} else {
MailPoet.Notice.error(
"<%= __('An error occured, please reload the page and try again.') %>"
"<%= __('An error occurred. Please reload the page and try again.') %>"
);
}
@ -505,7 +505,7 @@
var message = null;
if(response.is_widget === true) {
message = "<%= __('Saved! The changes are already active in your widget.') %>";
message = "<%= __('Saved! The changes are now active in your widget.') %>";
} else {
message = "<%= __('Saved! Add this form to %1$sa widget%2$s.') | format("<a href='widgets.php' target='_blank'>", '</a>') | raw %>";
}