From c05a20cff9b4a4410fec87276b7a92f25fb3bbdf Mon Sep 17 00:00:00 2001 From: Kiefer Conrad Date: Thu, 28 Jul 2016 11:11:06 +0200 Subject: [PATCH] Update 28 July 2016 --- lib/Config/Menu.php | 6 ++-- .../PostNotificationsBlankTemplate.php | 4 +-- .../Templates/WelcomeTemplate.php | 2 +- lib/Models/Subscriber.php | 2 +- lib/Router/SendingQueue.php | 8 +++--- .../ImportExport/Export/Export.php | 2 +- views/form/editor.html | 4 +-- views/form/templates/settings/field_form.hbs | 2 +- views/forms.html | 2 +- views/newsletter/editor.html | 6 ++-- .../blocks/automatedLatestContent/widget.hbs | 2 +- views/newsletters.html | 28 +++++++++---------- views/segments.html | 28 +++++++++---------- views/settings/advanced.html | 6 ++-- views/settings/basics.html | 6 ++-- views/settings/signup.html | 8 +++--- views/subscribers/importExport/import.html | 2 +- .../importExport/import/step2.html | 4 +-- .../importExport/import/step3.html | 2 +- views/subscribers/subscribers.html | 4 +-- 20 files changed, 64 insertions(+), 64 deletions(-) diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 142c86b929..d0809ea521 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -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') diff --git a/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php b/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php index bb36d9793b..013de463a5 100644 --- a/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php +++ b/lib/Config/PopulatorData/Templates/PostNotificationsBlankTemplate.php @@ -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" => __("

Ready to get started on your post notifications email?

\n

 

") + "text" => __("

Ready to get started on your Post Notifications email?

\n

 

") ) ) ) diff --git a/lib/Config/PopulatorData/Templates/WelcomeTemplate.php b/lib/Config/PopulatorData/Templates/WelcomeTemplate.php index ce048c434b..43143934d8 100644 --- a/lib/Config/PopulatorData/Templates/WelcomeTemplate.php +++ b/lib/Config/PopulatorData/Templates/WelcomeTemplate.php @@ -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()), diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index a16512da9d..ea00b8706d 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -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' => '' ); diff --git a/lib/Router/SendingQueue.php b/lib/Router/SendingQueue.php index 9ab1d0b32d..f990e45da6 100644 --- a/lib/Router/SendingQueue.php +++ b/lib/Router/SendingQueue.php @@ -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 ); } -} \ No newline at end of file +} diff --git a/lib/Subscribers/ImportExport/Export/Export.php b/lib/Subscribers/ImportExport/Export/Export.php index 95c389d518..b8f9edd908 100644 --- a/lib/Subscribers/ImportExport/Export/Export.php +++ b/lib/Subscribers/ImportExport/Export/Export.php @@ -172,7 +172,7 @@ class Export { return $XLSX_writer->writeSheetRow( ($this->group_by_segment_option) ? ucwords($segment) : - __('All Segments'), + __('All Lists'), $data ); } diff --git a/views/form/editor.html b/views/form/editor.html index d024b074c9..9ebbaa6ff8 100644 --- a/views/form/editor.html +++ b/views/form/editor.html @@ -3,7 +3,7 @@ <% block title %>

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

- <%= __("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]': '', '[/link]': '' diff --git a/views/form/templates/settings/field_form.hbs b/views/form/templates/settings/field_form.hbs index 91991de5ee..ad45172863 100644 --- a/views/form/templates/settings/field_form.hbs +++ b/views/form/templates/settings/field_form.hbs @@ -43,7 +43,7 @@

- + <%= source('newsletter/templates/svg/block-icons/auto-post.svg') %> -

<%= __('Automatic latest content') %>
+
<%= __('Automatic Latest Content') %>
diff --git a/views/newsletters.html b/views/newsletters.html index 574ac63001..480fd2389c 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -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'), diff --git a/views/segments.html b/views/segments.html index e6b4554f9d..c068477c99 100644 --- a/views/segments.html +++ b/views/segments.html @@ -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 %> diff --git a/views/settings/advanced.html b/views/settings/advanced.html index 5ad0f62e90..e3fc457dc3 100644 --- a/views/settings/advanced.html +++ b/views/settings/advanced.html @@ -4,7 +4,7 @@

<%= __('Your bounced emails will be sent to this address') %> @@ -74,7 +74,7 @@ <%= __('Open and click tracking') %>

- <%= __('Some users prefer to not track their subscribers') %> + <%= __('Enable or disable open and click tracking.') %>

@@ -148,7 +148,7 @@

- <%= __('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!') %>

diff --git a/views/settings/basics.html b/views/settings/basics.html index eeee558920..4736949de8 100644 --- a/views/settings/basics.html +++ b/views/settings/basics.html @@ -148,7 +148,7 @@ <%= __('Subscribe in registration form') %>

- <%= __('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') %>

@@ -181,7 +181,7 @@ />

- +