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

Merge pull request #521 from mailpoet/copy_review

Browse Source 
Copy review
This commit is contained in:
Tautvidas Sipavičius
2016-06-10 12:36:47 +03:00
committed by GitHub
parent 4b418f041b 77dd71935a
commit bfdabe3554
30 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.')
));
}