diff --git a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php index 3f81b677be..7318af83ba 100644 --- a/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php +++ b/lib/Config/PopulatorData/Templates/FranksRoastHouseTemplate.php @@ -46,7 +46,7 @@ class FranksRoastHouseTemplate { "blocks" => array( array( "type" => "header", - "text" => __("Display problems? View it in your browser"), + "text" => __("Open this email in your web browser."), "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" => __("

Hello there [user:firstname | default:Coffee Drinker]

\n

\n

Sit back and enjoy a cup of joe as you have a read of our latest newsletter. 

") + "text" => __("

Hi there [user:firstname | default:coffee drinker]

\n

\n

Sit back and enjoy your favorite roast as you read this week's newsletter. 

") ), array( "type" => "image", @@ -106,7 +106,7 @@ class FranksRoastHouseTemplate { ), array( "type" => "text", - "text" => __("

--- Guest Coffee: Brew Bros. ---

\n

\n

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 popularity through a number of pop-up events and collaborations with local street food vendors.

\n

\n
\n

Tasting notes: A rich, caramel flavour with subtle overtones of molasses. The perfect wake-up morning espresso.

\n
") + "text" => __("

--- Guest Coffee Roaster: Brew Bros. ---

\n

\n

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 popularity through pop-up shops, local events, and collaborations with food trucks.

\n

\n
\n

Tasting notes: A rich, caramel flavor with subtle hints of molasses. The perfect wake-up morning espresso!

\n
") ) ) ) @@ -150,7 +150,7 @@ class FranksRoastHouseTemplate { ), array( "type" => "text", - "text" => __("

We're offering free lunch for a month if you can invent a new sandwich to go on our menu.

\n

\n

\n

Simply tweet your ideas to @franksroasthouse and use #sandwichcomp and we'll let you know if you're a winner.

") + "text" => __("

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.

\n

\n

\n

Simply tweet your ideas to @franksroasthouse and use #sandwichcomp and we'll let you know if you're a winner.

") ), array( "type" => "button", @@ -175,7 +175,7 @@ class FranksRoastHouseTemplate { ), array( "type" => "text", - "text" => __("

Follow us

") + "text" => __("

Follow Us

") ), array( "type" => "social", @@ -250,11 +250,11 @@ class FranksRoastHouseTemplate { ), array( "type" => "text", - "text" => __("

Watch out Westville Street, we're coming to you very soon! 

\n

\n

Keep an eye on your mailboxes, we'll have some special offers for our email subscribers and an exclusive Preview Evening invite.

") + "text" => __("

Watch out Broad Street, we're coming to you very soon! 

\n

\n

Keep an eye on your inbox, as we'll have some special offers for our email subscribers plus an exclusive launch party invite!

") ), array( "type" => "text", - "text" => __("

We're Now Open Longer

\n

\n

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:

\n

\n") + "text" => __("

New and Improved Hours!

\n

\n

Frank's is now open even later, so you can get your caffeine fix all day long! Here's our new opening hours:

\n

\n") ) ) ) diff --git a/lib/Config/Shortcodes.php b/lib/Config/Shortcodes.php index 4fc7026846..6162c4da6c 100644 --- a/lib/Config/Shortcodes.php +++ b/lib/Config/Shortcodes.php @@ -114,7 +114,7 @@ class Shortcodes { function renderArchiveSubject($newsletter) { return '' + .esc_attr(__('Preview in a new tab')).'">' .esc_attr($newsletter->subject). ''; } diff --git a/lib/Cron/CronHelper.php b/lib/Cron/CronHelper.php index b72918fb49..f043374d59 100644 --- a/lib/Cron/CronHelper.php +++ b/lib/Cron/CronHelper.php @@ -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.')); } } } \ No newline at end of file diff --git a/lib/Cron/Daemon.php b/lib/Cron/Daemon.php index 02607c4a66..0113d9f761 100644 --- a/lib/Cron/Daemon.php +++ b/lib/Cron/Daemon.php @@ -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(); diff --git a/lib/Cron/Workers/SendingQueue.php b/lib/Cron/Workers/SendingQueue.php index 79705b94fc..819a9bf519 100644 --- a/lib/Cron/Workers/SendingQueue.php +++ b/lib/Cron/Workers/SendingQueue.php @@ -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( diff --git a/lib/Form/Block/Base.php b/lib/Form/Block/Base.php index a7fb57259d..d9cd6a893e 100644 --- a/lib/Form/Block/Base.php +++ b/lib/Form/Block/Base.php @@ -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(); diff --git a/lib/Form/Widget.php b/lib/Form/Widget.php index bd2736f3bc..c53777b15f 100644 --- a/lib/Form/Widget.php +++ b/lib/Form/Widget.php @@ -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") ) ); diff --git a/lib/Models/CustomField.php b/lib/Models/CustomField.php index 15bee837a1..d6e98a1e7e 100644 --- a/lib/Models/CustomField.php +++ b/lib/Models/CustomField.php @@ -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.') )); } diff --git a/lib/Models/Form.php b/lib/Models/Form.php index b745075903..ae9169a4b8 100644 --- a/lib/Models/Form.php +++ b/lib/Models/Form.php @@ -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.') )); } diff --git a/lib/Models/Newsletter.php b/lib/Models/Newsletter.php index ad79dac939..ec8b943fc8 100644 --- a/lib/Models/Newsletter.php +++ b/lib/Models/Newsletter.php @@ -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' => '' ); diff --git a/lib/Models/NewsletterOptionField.php b/lib/Models/NewsletterOptionField.php index 09194b8a15..4540f7eb04 100644 --- a/lib/Models/NewsletterOptionField.php +++ b/lib/Models/NewsletterOptionField.php @@ -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.') )); } diff --git a/lib/Models/NewsletterTemplate.php b/lib/Models/NewsletterTemplate.php index a523d4e0cf..28fc4484a8 100644 --- a/lib/Models/NewsletterTemplate.php +++ b/lib/Models/NewsletterTemplate.php @@ -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.') )); } diff --git a/lib/Models/Segment.php b/lib/Models/Segment.php index 7ed784e50c..a7167e82ba 100644 --- a/lib/Models/Segment.php +++ b/lib/Models/Segment.php @@ -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) ? diff --git a/lib/Models/Setting.php b/lib/Models/Setting.php index 503be71ba8..4d3c807806 100644 --- a/lib/Models/Setting.php +++ b/lib/Models/Setting.php @@ -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!") ) ); } diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index f757886259..d346972be5 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -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.') )); } diff --git a/lib/Newsletter/Shortcodes/ShortcodesHelper.php b/lib/Newsletter/Shortcodes/ShortcodesHelper.php index 9768ebeccc..9baf4f533b 100644 --- a/lib/Newsletter/Shortcodes/ShortcodesHelper.php +++ b/lib/Newsletter/Shortcodes/ShortcodesHelper.php @@ -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( diff --git a/lib/Router/Forms.php b/lib/Router/Forms.php index af73bdcee8..f2172e3b66 100644 --- a/lib/Router/Forms.php +++ b/lib/Router/Forms.php @@ -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' ) diff --git a/lib/Router/SendingQueue.php b/lib/Router/SendingQueue.php index d930150c1c..187e285aef 100644 --- a/lib/Router/SendingQueue.php +++ b/lib/Router/SendingQueue.php @@ -70,7 +70,7 @@ class SendingQueue { return array( 'result' => true, 'data' => array( - 'message' => __('Your post notifications is activated.') + 'message' => __('Your post notifications are activated.') ) ); } diff --git a/lib/Router/Subscribers.php b/lib/Router/Subscribers.php index f1768c0c1f..99c09f87f2 100644 --- a/lib/Router/Subscribers.php +++ b/lib/Router/Subscribers.php @@ -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)) { diff --git a/lib/Subscribers/ImportExport/Import/MailChimp.php b/lib/Subscribers/ImportExport/Import/MailChimp.php index 303ed44555..efd8553401 100644 --- a/lib/Subscribers/ImportExport/Import/MailChimp.php +++ b/lib/Subscribers/ImportExport/Import/MailChimp.php @@ -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.'); diff --git a/lib/Subscription/Comment.php b/lib/Subscription/Comment.php index 25edc542b8..b554906e47 100644 --- a/lib/Subscription/Comment.php +++ b/lib/Subscription/Comment.php @@ -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 '

diff --git a/lib/Subscription/Pages.php b/lib/Subscription/Pages.php index 17bea4cb9d..c122e123cd 100644 --- a/lib/Subscription/Pages.php +++ b/lib/Subscription/Pages.php @@ -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 .= '

'.__('You made a mistake?').' '; + $content .= '

'.__('Accidentally unsubscribed?').' '; $content .= '[mailpoet_manage]'; $content .= '

'; } diff --git a/lib/Subscription/Registration.php b/lib/Subscription/Registration.php index 64819f144d..3cd73c2bf4 100644 --- a/lib/Subscription/Registration.php +++ b/lib/Subscription/Registration.php @@ -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 '

diff --git a/lib/Util/Permissions.php b/lib/Util/Permissions.php index cb80dbf857..e1bb8f80ff 100644 --- a/lib/Util/Permissions.php +++ b/lib/Util/Permissions.php @@ -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' => diff --git a/views/form/editor.html b/views/form/editor.html index 6bb2596a84..f71caa01e9 100644 --- a/views/form/editor.html +++ b/views/form/editor.html @@ -3,12 +3,12 @@ <% block title %>

<%= __('Form') %> - <%= __('Back to list') %> + <%= __('Back to List') %>

@@ -47,14 +47,14 @@

- <%= __('This form adds subscribers to these lists:') %> + <%= __('This form adds the subscribers to these lists:') %>