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

Update 28 July 2016

Browse Source
This commit is contained in:
Kiefer Conrad
2016-07-28 11:11:06 +02:00
committed by Tautvidas Sipavičius
parent 08cb994252
commit c05a20cff9
20 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Config/Menu.php
View File

@ -105,8 +105,8 @@ class Menu {
$segments_page = add_submenu_page(
$main_page_slug,
$this->setPageTitle(__('Segments')),
__('Segments'),
$this->setPageTitle(__('Lists')),
__('Lists'),
'manage_options',
'mailpoet-segments',
array($this, 'segments')
@ -170,7 +170,7 @@ class Menu {
add_submenu_page(
true,
$this->setPageTitle(__('Form')),
__('Form editor'),
__('Form Editor'),
'manage_options',
'mailpoet-form-editor',
array($this, 'formEditor')

4
lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php
View File

@ -14,7 +14,7 @@ class PostNotificationsBlankTemplate {
function get() {
return array(
'name' => __("Blank Post Notifications Template"),
'description' => __("A simple post notifications template. Customize it and make it your own!"),
'description' => __("A simple Post Notifications template. Customize it and make it your own!"),
'readonly' => 0,
'thumbnail' => $this->getThumbnail(),
'body' => json_encode($this->getBody()),
@ -46,7 +46,7 @@ class PostNotificationsBlankTemplate {
"blocks" => array(
array(
"type" => "text",
"text" => __("<h2 style=\"text-align: center;\">Ready to get started on your&nbsp;post notifications email?</h2>\n<p style=\"text-align: center;\">&nbsp;</p>")
"text" => __("<h2 style=\"text-align: center;\">Ready to get started on your&nbsp;Post Notifications email?</h2>\n<p style=\"text-align: center;\">&nbsp;</p>")
)
)
)

2
lib/Config/PopulatorData/Templates/WelcomeTemplate.php
View File

@ -14,7 +14,7 @@ class WelcomeTemplate {
function get() {
return array(
'name' => __("Welcome Email Example"),
'description' => __("A simple welcome email idea to help welcome your new subscribers."),
'description' => __("A simple Welcome Email idea to help welcome your new subscribers."),
'readonly' => 0,
'thumbnail' => $this->getThumbnail(),
'body' => json_encode($this->getBody()),

2
lib/Models/Subscriber.php
View File

@ -212,7 +212,7 @@ class Subscriber extends Model {
$segments = Segment::orderByAsc('name')->findMany();
$segment_list = array();
$segment_list[] = array(
'label' => __('All segments'),
'label' => __('All Lists'),
'value' => ''
);

8
lib/Router/SendingQueue.php
View File

@ -51,8 +51,8 @@ class SendingQueue {
);
} else {
$message = ($newsletter->type === Newsletter::TYPE_WELCOME) ?
__('Your welcome email has been activated') :
__('Your post notification has been activated');
__('Your Welcome Email has been activated') :
__('Your Post Notification has been activated');
return array(
'result' => true,
'data' => array(
@ -106,7 +106,7 @@ class SendingQueue {
if(!count($subscribers)) {
return array(
'result' => false,
'errors' => array(__('There are no subscribers'))
'errors' => array(__('There are no subscribers in that list!'))
);
}
$queue->status = null;
@ -174,4 +174,4 @@ class SendingQueue {
'result' => $result
);
}
}
}

2
lib/Subscribers/ImportExport/Export/Export.php
View File

@ -172,7 +172,7 @@ class Export {
return $XLSX_writer->writeSheetRow(
($this->group_by_segment_option) ?
ucwords($segment) :
__('All Segments'),
__('All Lists'),
$data
);
}

4
views/form/editor.html
View File

@ -3,7 +3,7 @@
<% 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') %></a>
</h1>
<h2>
<input
@ -137,7 +137,7 @@
%>
</p>
<p>
<%= __("Copy and paste this [link]shortcode[/link] into a post or page.")
<%= __("Copy and paste this [link]shortcode[/link] on to a post or page.")
| replace({
'[link]': '<a href="javascript:;" class="mailpoet_form_export_toggle" data-type="shortcode">',
'[/link]': '</a>'

2
views/form/templates/settings/field_form.hbs
View File

@ -43,7 +43,7 @@
</select>
</p>
<p>
<label><%= __("Field's name:") %></label>
<label><%= __("Field name:") %></label>
<input
type="text"
name="name"

2
views/forms.html
View File

@ -42,7 +42,7 @@
'formName': __('Name'),
'segments': __('Lists'),
'signups': __('Signups'),
'createdOn': __('Created on'),
'createdOn': __('Created On'),
'oneFormTrashed': __('1 form was moved to the trash'),
'multipleFormsTrashed': __('%$1d forms were moved to the trash'),
'oneFormDeleted': __('1 form was permanently deleted'),

6
views/newsletter/editor.html
View File

@ -318,10 +318,10 @@
'failedToFetchAvailablePosts': __('Failed to fetch available posts'),
'failedToFetchRenderedPosts': __('Failed to fetch rendered posts'),
'shortcodesWindowTitle': __('Select a shortcode'),
'unsubscribeLinkMissing': __('All newsletters must include an "unsubscribe" link. Add a footer widget to your newsletter to continue'),
'unsubscribeLinkMissing': __('All newsletters must include an "Unsubscribe" link. Add a footer widget to your newsletter to continue'),
'newsletterPreviewEmailMissing': __('Enter an email address to send the preview newsletter to'),
'newsletterPreviewFailed': __('Preview failed. Pleae check console log'),
'newsletterPreviewSent': __('Newsletter preview email has been successfully sent!'),
'newsletterPreviewFailed': __('Preview failed. Please check console log'),
'newsletterPreviewSent': __('Your test email has been sent!'),
'newsletterPreviewFailedToSend': __('Attempt to send a newsletter preview email failed. Please verify that your sending method is configured correctly and try again'),
'templateNameMissing': __('Please add a template name'),
'templateDescriptionMissing': __('Please add a template description'),

2
views/newsletter/templates/blocks/automatedLatestContent/widget.hbs
View File

@ -1,4 +1,4 @@
<div class="mailpoet_widget_icon">
<%= source('newsletter/templates/svg/block-icons/auto-post.svg') %>
</div>
<div class="mailpoet_widget_title"><%= __('Automatic latest content') %></div>
<div class="mailpoet_widget_title"><%= __('Automatic Latest Content') %></div>

28
views/newsletters.html
View File

@ -23,12 +23,12 @@
'pageTitle': __('Newsletters'),
'tabStandardTitle': __('Newsletters'),
'tabWelcomeTitle': __('Welcome emails'),
'tabNotificationTitle': __('Post notifications'),
'tabWelcomeTitle': __('Welcome Emails'),
'tabNotificationTitle': __('Post Notifications'),
'searchLabel': __('Search'),
'loadingItems': __('Loading newsletters...'),
'noItemsFound': __('No newsletters found'),
'noItemsFound': __('Nothing here yet! But, don't fret - there's no reason to get upset. Pretty soon, you’ll be sending emails faster than a turbo-jet.'),
'selectAllLabel': __('All newsletters on this page are selected'),
'selectedAllLabel': __('All %d newsletters are selected'),
'selectAllLink': __('Select all newsletters on all pages'),
@ -104,15 +104,15 @@
'regularNewsletterTypeTitle': __('Newsletter'),
'regularNewsletterTypeDescription': __('Send a newsletter with images, buttons, dividers, and social bookmarks. Or, just send a basic text email.'),
'create': __('Create'),
'welcomeNewsletterTypeTitle': __('Welcome email'),
'welcomeNewsletterTypeTitle': __('Welcome Email'),
'welcomeNewsletterTypeDescription': __('Send an email to new users'),
'setUp': __('Set up'),
'postNotificationNewsletterTypeTitle': __('Post notifications'),
'postNotificationNewsletterTypeTitle': __('Post Notifications'),
'postNotificationsNewsletterTypeDescription': __('Automatically send posts immediately, daily, weekly or monthly. Filter by categories, if you like.'),
'selectFrequency': __('Select a frequency'),
'postNotificationSubjectLineTip': __("Insert [newsletter:total] to show number of posts, [newsletter:post_title] to show the latest post's title & [newsletter:number] to display the issue number."),
'activate': __('Activate'),
'sendWelcomeEmailWhen': __('Send this welcome email when...'),
'sendWelcomeEmailWhen': __('Send this Welcome Email when...'),
'daily': __('Once a day at...'),
'weekly': __('Weekly on...'),
@ -133,7 +133,7 @@
'last': __('last'),
'next': __('Next'),
'selectEventToSendWelcomeEmail': __('When is this welcome email sent?'),
'selectEventToSendWelcomeEmail': __('When is this Welcome Email sent?'),
'onSubscriptionToList': __('When someone subscribes to the list...'),
'onWPUserRegistration': __('When a new WordPress user is added to your site...'),
@ -145,10 +145,10 @@
'subjectLine': __('Subject line'),
'subjectLineTip': __("Be creative! It's the first thing that your subscribers see. Tempt them to open your email."),
'emptySubjectLineError': __('Please specify a subject'),
'segments': __('Segments'),
'segmentsTip': __('This subscriber segment will be used for this campaign'),
'selectSegmentPlaceholder': __('Select a segment'),
'noSegmentsSelectedError': __('Please select a segment'),
'segments': __('Lists'),
'segmentsTip': __('Your email newsletter(s) will be sent to this list.'),
'selectSegmentPlaceholder': __('Select a list'),
'noSegmentsSelectedError': __('Please select a list'),
'sender': __('Sender'),
'senderTip': __('Your name and email.'),
'senderNamePlaceholder': __('John Doe'),
@ -211,12 +211,12 @@
'next': __('Next'),
'previous': __('Previous'),
'welcomeEmailActivated': __('Your welcome email is now active!'),
'welcomeEmailActivationFailed': __('Your welcome email could not be activated, please check the settings'),
'welcomeEmailActivated': __('Your Welcome Email is now activated!'),
'welcomeEmailActivationFailed': __('Your Welcome Email could not be activated, please check the settings'),
'postNotificationActivated': __('Your post notification is now active!'),
'postNotificationActivationFailed': __('Your post notification could not be activated, check the settings'),
'welcomeEventSegment': __('This newsletter is sent when someone subscribes to the list "%$1s"'),
'welcomeEventSegment': __('This newsletter is sent when someone subscribes to the list: "%$1s"'),
'welcomeEventWPUserAnyRole': __('This newsletter is sent when a new WordPress user is added to your site'),
'welcomeEventWPUserWithRole': __('This newsletter is sent when a new WordPress user with the role "%$1s" is added to your site'),
'sendingDelayHours': __('%$1d hour(s) later'),

28
views/segments.html
View File

@ -10,15 +10,15 @@
<% block translations %>
<%= localize({
'pageTitle': __('Segments'),
'pageTitle': __('Lists'),
'searchLabel': __('Search'),
'loadingItems': __('Loading segments...'),
'noItemsFound': __('No segments found'),
'selectAllLabel': __('All segments on this page are selected'),
'selectedAllLabel': __('All %d segments are selected'),
'selectAllLink': __('Select all segments on all pages'),
'loadingItems': __('Loading lists...'),
'noItemsFound': __('No lists found'),
'selectAllLabel': __('All lists on this page are selected'),
'selectedAllLabel': __('All %d lists are selected'),
'selectAllLink': __('Select all lists on all pages'),
'clearSelection': __('Clear selection'),
'permanentlyDeleted': __('%d segments were permanently deleted'),
'permanentlyDeleted': __('%d lists were permanently deleted'),
'selectBulkAction': __('Select bulk action'),
'bulkActions': __('Bulk Actions'),
'apply': __('Apply'),
@ -31,12 +31,12 @@
'unconfirmed': __('Unconfirmed'),
'unsubscribed': __('Unsubscribed'),
'createdOn': __('Created on'),
'oneSegmentTrashed': __('1 segment was moved to the trash'),
'multipleSegmentsTrashed': __('%$1d segments were moved to the trash'),
'oneSegmentDeleted': __('1 segment was permanently deleted'),
'multipleSegmentsDeleted': __('%$1d segments were permanently deleted'),
'oneSegmentRestored': __('1 segment has been restored from the trash'),
'multipleSegmentsRestored': __('%$1d segments have been restored from the trash'),
'oneSegmentTrashed': __('1 list was moved to the trash'),
'multipleSegmentsTrashed': __('%$1d lists were moved to the trash'),
'oneSegmentDeleted': __('1 list was permanently deleted'),
'multipleSegmentsDeleted': __('%$1d list were permanently deleted'),
'oneSegmentRestored': __('1 list has been restored from the trash'),
'multipleSegmentsRestored': __('%$1d lists have been restored from the trash'),
'duplicate': __('Duplicate'),
'listDuplicated': __('List "%$1s" has been duplicated'),
'update': __('Update'),
@ -62,6 +62,6 @@
'numberOfItems': __('%$1d items'),
'segmentDescriptionTip': __('This text box is for your own use and is never shown to your subscribers'),
'backToList': __('Back to list')
'backToList': __('Back')
}) %>
<% endblock %>

6
views/settings/advanced.html
View File

@ -4,7 +4,7 @@
<tr>
<th scope="row">
<label for="settings[bounce_email]">
<%= __('Bounce email') %>
<%= __('Bounce email address') %>
</label>
<p class="description">
<%= __('Your bounced emails will be sent to this address') %>
@ -74,7 +74,7 @@
<%= __('Open and click tracking') %>
</label>
<p class="description">
<%= __('Some users prefer to not track their subscribers') %>
<%= __('Enable or disable open and click tracking.') %>
</p>
</th>
<td>
@ -148,7 +148,7 @@
<th scope="row">
<label><%= __('Reinstall from scratch') %></label>
<p class="description">
<%= __('Want to start over? This will completely wipe out MailPoet and reinstall from scratch.') %>
<%= __('Want to start from the beginning? This will completely delete MailPoet and reinstall it from scratch. Remember: you will lose all of your data!') %>
</p>
</th>
<td>

6
views/settings/basics.html
View File

@ -148,7 +148,7 @@
<%= __('Subscribe in registration form') %>
</label>
<p class="description">
<%= __('Allow users who register on your site to subscribe to a list') %>
<%= __('Allow users who register as a WordPress user on your website to subscribe to a MailPoet list (in addition to the "WordPress Users" list') %>
</p>
</th>
<td>
@ -181,7 +181,7 @@
/>
</p>
<p>
<label><%= __('Users will be subscribed from these lists:') %></label>
<label><%= __('Users will be subscribed to these lists:') %></label>
</p>
<p>
<select
@ -340,7 +340,7 @@
<tr>
<th scope="row">
<label>
<%= __('This shortcode displays the total number of subscribers') %>
<%= __('Shortcode to Display Total Number of Subscribers') %>
</label>
<p class="description">
<%= __('Paste this shortcode on a post or page to display the total number of confirmed subscribers') %>

8
views/settings/signup.html
View File

@ -7,8 +7,8 @@
<%= __('Enable signup confirmation') %>
</label>
<p class="description">
<%= __('Prevent people from being unwillingly subscribed to your mailing list. This option ensures you to keep a clean list.') %>
<a href="#TODO" target="_blank"><%= __('Learn more.') %></a>
<%= __('If you enable this option, your subscribers will first receive a confirmation email after they subscribe. Once they confirm their subscription (via this email), they will be marked as 'confirmed' and will begin to receive your email newsletters.') %>
<a href="#TODO" target="_blank"><%= __('Read more about Double Opt-in confirmation.') %></a>
</p>
</th>
<td>
@ -16,7 +16,7 @@
id="mailpoet_signup_confirmation_notice"
<% if (settings.mta_group != "mailpoet") %>style="display:none;"<% endif %>
>
<%=- __('Sending with MailPoet requires signup confirmation to be turned on.') -%>
<%=- __('Signup confirmation is mandatory when using the MailPoet Sending Service.') -%>
</p>
<p
id="mailpoet_signup_confirmation_input"
@ -151,7 +151,7 @@
<%= __('Confirmation page') %>
</label>
<p class="description">
<%= __('When subscribers click on the activation link, they are redirected to this page') %>
<%= __('When subscribers click on the activation link, they will be redirected to this page') %>
</p>
</th>
<td>

2
views/subscribers/importExport/import.html
View File

@ -5,7 +5,7 @@
<div id="mailpoet_subscribers_import" class="wrap">
<h1 class="title">
<%= __('Import') %>
<a class="page-title-action" href="?page=mailpoet-subscribers#/"><%= __('Back to subscribers') %></a>
<a class="page-title-action" href="?page=mailpoet-subscribers#/"><%= __('Back to Subscribers') %></a>
</h1>
<!-- STEP 1: method selection -->
<% include 'subscribers/importExport/import/step1.html' %>

4
views/subscribers/importExport/import/step2.html
View File

@ -33,8 +33,8 @@
<tr class="mailpoet_segments mailpoet_hidden">
<th scope="row">
<label>
<%= __('Pick one or many segments') %>
<p class="description"><%= __('Pick the segments that you want to import these subscribers to.') %>
<%= __('Pick one or more list(s)') %>
<p class="description"><%= __('Pick the list that you want to import these subscribers to.') %>
</label>
</th>
<td>

2
views/subscribers/importExport/import/step3.html
View File

@ -28,7 +28,7 @@
<p><%= __('No new subscribers were found/added') %></p>
{{/if}}
{{#if added_to_segment_with_welcome_notification}}
<p><%= __('Note: Imported subscribers will not receive any welcome emails') %></p>
<p><%= __('Note: Imported subscribers will not receive any Welcome Emails') %></p>
{{/if}}
</script>
</div>

4
views/subscribers/subscribers.html
View File

@ -80,7 +80,7 @@
'WPUsersSegment': __('WordPress Users'),
'WPUserEditNotice': __('This subscriber is a registered WordPress user. [link]Edit his profile[/link] to change his/her email.'),
'tip': __('Tip:'),
'customFieldsTip': __('Need to add new fields, like telephone number or street address? You can add custom fields by editing the subscription form.'),
'customFieldsTip': __('Need to add new fields, like a telephone number or street address? You can add custom fields by editing the subscription form on the Forms page.'),
'year': __('Year'),
'month': __('Month'),
'day': __('Day'),
@ -88,6 +88,6 @@
'import': __('Import'),
'export': __('Export'),
'save': __('Save'),
'backToList': __('Back to list')
'backToList': __('Back')
}) %>
<% endblock %>