From e77695f144cd8093b02d67b7097e051a341ecc4f Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Wed, 30 Aug 2017 13:07:11 -0300 Subject: [PATCH 01/13] Update changelog --- src/readme.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/readme.txt b/src/readme.txt index 3d089b981..304234fd2 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -165,6 +165,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/). * Fixed bug on saving modules settings where changes were not being saved; * Fixed default color and icon for existent statuses; +* Changed: +* Improved default colors for custom statuses; + = [1.7.0] - 2017-08-29 = * Added: From 07a180c751f5f64678cf2a42cc03d478ac14233c Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 10:41:18 -0300 Subject: [PATCH 02/13] Improve default notification to avoid too much emails, PPRESS-230 --- .../improved-notifications.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/modules/improved-notifications/improved-notifications.php b/src/modules/improved-notifications/improved-notifications.php index 761df5592..c26e57e1a 100644 --- a/src/modules/improved-notifications/improved-notifications.php +++ b/src/modules/improved-notifications/improved-notifications.php @@ -193,10 +193,11 @@ protected function create_default_workflows() { // Post Save $args = [ - 'post_title' => __( 'Notify when posts are saved', 'publishpress' ), + 'post_title' => __( 'Notify when content is published', 'publishpress' ), 'event_meta_key' => Event_Post_save::META_KEY_SELECTED, - 'content_subject' => 'Changes were saved to "[psppno_post title]"', + 'content_subject' => '"[psppno_post title]" was published', 'content_body' => $twig->render( 'workflow_default_content_post_save.twig', [] ), + 'meta_input' => [ Filter_Post_Status::META_KEY_POST_STATUS_TO => 'publish' ], ]; $this->create_default_workflow( $args ); @@ -230,7 +231,6 @@ protected function create_default_workflow( $args ) { 'meta_input' => [ static::META_KEY_IS_DEFAULT_WORKFLOW => '1', $args['event_meta_key'] => '1', - Filter_Post_Type::META_KEY_POST_TYPE => 'all', Filter_Post_Status::META_KEY_POST_STATUS_FROM => 'all', Filter_Post_Status::META_KEY_POST_STATUS_TO => 'all', Filter_Category::META_KEY_CATEGORY => 'all', @@ -240,7 +240,17 @@ protected function create_default_workflow( $args ) { ], ]; - wp_insert_post( $workflow ); + // Check if we have additional meta_inputs + if ( isset( $args['meta_input']) && ! empty( $args['meta_input'] ) ) { + $workflow['meta_input'] = array_merge( $workflow['meta_input'], $args['meta_input'] ); + } + + $post_id = wp_insert_post( $workflow ); + + if ( is_int( $post_id ) && ! empty( $post_id ) ) { + add_post_meta( $post_id, Filter_Post_Type::META_KEY_POST_TYPE, 'post', false ); + add_post_meta( $post_id, Filter_Post_Type::META_KEY_POST_TYPE, 'page', false ); + } } /** From 5d2fd1ed3e716b6d9bb26568ac5f5835fa39d1fa Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 11:12:49 -0300 Subject: [PATCH 03/13] Fix the message after delete a workflow, and other messages, PPRESS-231 --- src/libraries/Notifications/Plugin.php | 48 +++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/src/libraries/Notifications/Plugin.php b/src/libraries/Notifications/Plugin.php index 4192ea2f1..c822a3939 100644 --- a/src/libraries/Notifications/Plugin.php +++ b/src/libraries/Notifications/Plugin.php @@ -27,6 +27,7 @@ public function init() { add_action( 'load-edit.php', [ $this, 'add_load_edit_hooks' ] ); add_filter( 'post_updated_messages', [ $this, 'filter_post_updated_messages' ] ); + add_filter( 'bulk_post_updated_messages', [ $this, 'filter_bulk_post_updated_messages' ], 10, 2 ); } /** @@ -185,6 +186,14 @@ protected function print_column_receivers( $post_id ) { } } + /** + * Customize the post messages for the notification workflows when the + * content is saved. + * + * @param string $messages + * + * @return array + */ public function filter_post_updated_messages( $messages ) { global $current_screen; @@ -192,8 +201,45 @@ public function filter_post_updated_messages( $messages ) { return $messages; } - $messages['post'][1] = __( 'Notification workflow updated.', 'pulishpress' ); + $post = get_post(); + + /* translators: Publish box date format, see https://secure.php.net/date */ + $scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) ); + + $messages['post'][1] = __( 'Notification workflow updated.', 'pulishpress' ); + $messages['post'][4] = __( 'Notification workflow updated.', 'pulishpress' ); + $messages['post'][6] = __( 'Notification workflow published.', 'pulishpress' ); + $messages['post'][7] = __( 'Notification workflow saved.', 'pulishpress' ); + $messages['post'][8] = __( 'Notification workflow submitted.', 'pulishpress' ); + $messages['post'][9] = sprintf( __( 'Notification workflow scheduled for: %s.' ), '' . $scheduled_date . '' ); + $messages['post'][10] = __( 'Notification workflow draft updated.', 'pulishpress' ); return $messages; } + + /** + * Customize the post messages for the notification workflows when the + * content is bulk edited. + * + * @param string $bulk_messages + * @param int $bulk_contents + * + * @return array + */ + public function filter_bulk_post_updated_messages( $bulk_messages, $bulk_counts ) { + global $current_screen; + + if ( PUBLISHPRESS_NOTIF_POST_TYPE_WORKFLOW !== $current_screen->post_type ) { + return $bulk_messages; + } + + $bulk_messages['post']['updated'] = _n( '%s notification workflow updated.', '%s notification workflows updated.', $bulk_counts['updated'] ); + $bulk_messages['post']['locked'] = ( 1 == $bulk_counts['locked'] ) ? __( '1 notification workflow not updated, somebody is editing it.' ) : + _n( '%s notification workflow not updated, somebody is editing it.', '%s notification workflows not updated, somebody is editing them.', $bulk_counts['locked'] ); + $bulk_messages['post']['deleted'] = _n( '%s notification workflow permanently deleted.', '%s notification workflows permanently deleted.', $bulk_counts['deleted'] ); + $bulk_messages['post']['trashed'] = _n( '%s notification workflow moved to the Trash.', '%s notification workflows moved to the Trash.', $bulk_counts['trashed'] ); + $bulk_messages['post']['untrashed'] = _n( '%s notification workflow restored from the Trash.', '%s notification workflows restored from the Trash.', $bulk_counts['untrashed'] ); + + return $bulk_messages; + } } From 2d1113e4288127db1d249eeecebf84f10989a83c Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 11:21:45 -0300 Subject: [PATCH 04/13] Improve the text of the default notification --- src/twig/workflow_default_content_post_save.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/twig/workflow_default_content_post_save.twig b/src/twig/workflow_default_content_post_save.twig index b3629171c..eb2cfdf94 100644 --- a/src/twig/workflow_default_content_post_save.twig +++ b/src/twig/workflow_default_content_post_save.twig @@ -1,6 +1,6 @@ Thank you for helping create great content with us. -This notification is to let you know changes were saved for "[psppno_post title]". +This notification is to let you know the content "[psppno_post title]" was published. The user who saved the changes is [psppno_actor display_name]. From ea9021f6447fbb4f65230b2e7c3fe92a9937ab1d Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 11:52:24 -0300 Subject: [PATCH 05/13] Update version to 1.7.2a1 --- src/includes.php | 2 +- src/publishpress.php | 2 +- src/readme.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/includes.php b/src/includes.php index 41c57a26f..13d178d93 100644 --- a/src/includes.php +++ b/src/includes.php @@ -40,7 +40,7 @@ ); // Define contants - define( 'PUBLISHPRESS_VERSION', '1.7.1' ); + define( 'PUBLISHPRESS_VERSION', '1.7.2a1' ); define( 'PUBLISHPRESS_ROOT', dirname( __FILE__ ) ); define( 'PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_ROOT . '/' . basename( __FILE__ ) ); define( 'PUBLISHPRESS_URL', plugins_url( '/', __FILE__ ) ); diff --git a/src/publishpress.php b/src/publishpress.php index 615be7c3a..2c1d26aea 100644 --- a/src/publishpress.php +++ b/src/publishpress.php @@ -5,7 +5,7 @@ * Description: The essential plugin for any WordPress site with multiple writers * Author: PressShack * Author URI: https://pressshack.com - * Version: 1.7.1 + * Version: 1.7.2a1 * * Copyright (c) 2017 PressShack * diff --git a/src/readme.txt b/src/readme.txt index 304234fd2..15e97cc9f 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -5,7 +5,7 @@ Author URI: https://pressshack.com Tags: Content Calendar, Editorial Calendar, workflow, checklist, pre-publish Requires at least: 4.6 Tested up to: 4.8 -Stable tag: 1.7.1 +Stable tag: 1.7.2 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html From 0da87050c529010efa12b927ac154cbbc30f81b2 Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 12:43:37 -0300 Subject: [PATCH 06/13] Ignore autosave for notifications --- .../improved-notifications/improved-notifications.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/modules/improved-notifications/improved-notifications.php b/src/modules/improved-notifications/improved-notifications.php index c26e57e1a..419fdaa92 100644 --- a/src/modules/improved-notifications/improved-notifications.php +++ b/src/modules/improved-notifications/improved-notifications.php @@ -310,6 +310,11 @@ public function action_transition_post_status( $new_status, $old_status, $post ) return; } + // Ignores auto-save + if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { + return; + } + // Go ahead and do the action to run workflows $args = [ 'action' => 'transition_post_status', From f3898b2a3b28f5c9eb87d1e3715008a2592e55c1 Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 13:27:17 -0300 Subject: [PATCH 07/13] Fix the default workflow for saving posts to only work on the transition to Publish --- .../improved-notifications.php | 85 ++++++++++--------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/src/modules/improved-notifications/improved-notifications.php b/src/modules/improved-notifications/improved-notifications.php index 419fdaa92..8c794d613 100644 --- a/src/modules/improved-notifications/improved-notifications.php +++ b/src/modules/improved-notifications/improved-notifications.php @@ -181,70 +181,78 @@ public function init() { public function install() { // Check if we any other workflow before create, avoiding duplicated registers if ( false === $this->has_default_workflows() ) { - $this->create_default_workflows(); + $this->create_default_workflow_post_save(); + $this->create_default_workflow_editorial_comment(); } } /** * Create default notification workflows based on current notification settings */ - protected function create_default_workflows() { + protected function create_default_workflow_post_save() { $twig = $this->get_service( 'twig' ); + // Get post statuses + $statuses = $this->get_post_statuses(); + // Remove the published state + foreach ( $statuses as $index => $status ) { + if ( $status->slug === 'publish' ) { + unset( $statuses[ $index ] ); + } + } + // Post Save - $args = [ - 'post_title' => __( 'Notify when content is published', 'publishpress' ), - 'event_meta_key' => Event_Post_save::META_KEY_SELECTED, - 'content_subject' => '"[psppno_post title]" was published', - 'content_body' => $twig->render( 'workflow_default_content_post_save.twig', [] ), - 'meta_input' => [ Filter_Post_Status::META_KEY_POST_STATUS_TO => 'publish' ], + $workflow = [ + 'post_status' => 'publish', + 'post_title' => __( 'Notify when content is published', 'publishpress' ), + 'post_type' => 'psppnotif_workflow', + 'meta_input' => [ + static::META_KEY_IS_DEFAULT_WORKFLOW => '1', + Event_Post_save::META_KEY_SELECTED => '1', + Filter_Post_Status::META_KEY_POST_STATUS_TO => 'publish', + Filter_Category::META_KEY_CATEGORY => 'all', + Content_Main::META_KEY_SUBJECT => '"[psppno_post title]" was published', + Content_Main::META_KEY_BODY => $twig->render( 'workflow_default_content_post_save.twig', [] ), + Receiver_Site_Admin::META_KEY => 1, + ], ]; - $this->create_default_workflow( $args ); - // Editorial Comment - $args = [ - 'post_title' => __( 'Notify on editorial comments', 'publishpress' ), - 'event_meta_key' => Event_Editorial_Comment::META_KEY_SELECTED, - 'content_subject' => 'New editorial comment to "[psppno_post title]"', - 'content_body' => $twig->render( 'workflow_default_content_editorial_comment.twig', [] ), - ]; - $this->create_default_workflow( $args ); + $post_id = wp_insert_post( $workflow ); + + if ( is_int( $post_id ) && ! empty( $post_id ) ) { + add_post_meta( $post_id, Filter_Post_Type::META_KEY_POST_TYPE, 'post', false ); + add_post_meta( $post_id, Filter_Post_Type::META_KEY_POST_TYPE, 'page', false ); + + // Add each status to the "From" filter, except the "publish" state + foreach ( $statuses as $status ) { + add_post_meta( $post_id, Filter_Post_Status ::META_KEY_POST_STATUS_FROM, $status->slug, false ); + } + } } /** - * Create default notification workflow for the post_save event - * - * $args = [ - * 'post_title' => ... - * 'content_subject' => ... - * 'content_body' => ... - * 'event_meta_key' => ... - * ] - * - * @param array $args + * Create default notification workflow for the editorial comments */ - protected function create_default_workflow( $args ) { + protected function create_default_workflow_editorial_comment() { + $twig = $this->get_service( 'twig' ); + + // Post Save $workflow = [ 'post_status' => 'publish', - 'post_title' => $args['post_title'], + 'post_title' => __( 'Notify on editorial comments', 'publishpress' ), 'post_type' => 'psppnotif_workflow', 'meta_input' => [ static::META_KEY_IS_DEFAULT_WORKFLOW => '1', - $args['event_meta_key'] => '1', - Filter_Post_Status::META_KEY_POST_STATUS_FROM => 'all', + Event_Editorial_Comment::META_KEY_SELECTED => '1', Filter_Post_Status::META_KEY_POST_STATUS_TO => 'all', + Filter_Post_Status::META_KEY_POST_STATUS_FROM => 'all', Filter_Category::META_KEY_CATEGORY => 'all', - Content_Main::META_KEY_SUBJECT => $args['content_subject'], - Content_Main::META_KEY_BODY => $args['content_body'], + Content_Main::META_KEY_SUBJECT => 'New editorial comment to "[psppno_post title]"', + Content_Main::META_KEY_BODY => $twig->render( 'workflow_default_content_editorial_comment.twig', [] ), Receiver_Site_Admin::META_KEY => 1, ], ]; - // Check if we have additional meta_inputs - if ( isset( $args['meta_input']) && ! empty( $args['meta_input'] ) ) { - $workflow['meta_input'] = array_merge( $workflow['meta_input'], $args['meta_input'] ); - } - $post_id = wp_insert_post( $workflow ); if ( is_int( $post_id ) && ! empty( $post_id ) ) { @@ -253,6 +261,7 @@ protected function create_default_workflow( $args ) { } } + /** * Returns true if we found any default workflow * From d290c83de3f1d1cd5aca0dd2bc0df9d1f0dabd96 Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 13:30:24 -0300 Subject: [PATCH 08/13] Update changelog --- src/readme.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/readme.txt b/src/readme.txt index 15e97cc9f..3fedaea23 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -157,6 +157,13 @@ You can install PublishPress through your WordPress admin area: The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). += [1.7.2] - 2017-08-31 = + +* Fixed: +* Fixed default notification workflows to avoid notifications on every post save, but only when the content transition to Published; +* Fixed the message after delete workflows; +* Fixed the notifications workflows to ignore autosaves; + = [1.7.1] - 2017-08-30 = * Fixed: From d6ea798a1a52defbe122843ec77072ca91337d33 Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 13:31:00 -0300 Subject: [PATCH 09/13] Update the language template file --- src/languages/publishpress.pot | 292 ++++++++++++++++++++------------- 1 file changed, 178 insertions(+), 114 deletions(-) diff --git a/src/languages/publishpress.pot b/src/languages/publishpress.pot index 84fbc7a3b..59d8d5efd 100644 --- a/src/languages/publishpress.pot +++ b/src/languages/publishpress.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Project-Id-Version: PublishPress\n" -"POT-Creation-Date: 2017-08-29 15:36-0300\n" +"POT-Creation-Date: 2017-08-31 13:30-0300\n" "PO-Revision-Date: 2016-04-22 07:37+0800\n" "Last-Translator: \n" "Language-Team: \n" @@ -26,19 +26,19 @@ msgstr "" msgid "Page" msgstr "" -#: common/php/class-module.php:178 common/php/class-module.php:243 libraries/Notifications/Traits/PublishPress_Module.php:50 modules/custom-status/custom-status.php:186 +#: common/php/class-module.php:178 common/php/class-module.php:243 libraries/Notifications/Traits/PublishPress_Module.php:50 modules/custom-status/custom-status.php:185 msgid "Draft" msgstr "" -#: common/php/class-module.php:184 common/php/class-module.php:246 libraries/Notifications/Traits/PublishPress_Module.php:56 modules/custom-status/custom-status.php:196 +#: common/php/class-module.php:184 common/php/class-module.php:246 libraries/Notifications/Traits/PublishPress_Module.php:56 modules/custom-status/custom-status.php:195 msgid "Pending Review" msgstr "" -#: common/php/class-module.php:242 modules/calendar/calendar.php:1250 modules/custom-status/custom-status.php:734 +#: common/php/class-module.php:242 modules/calendar/calendar.php:1250 modules/custom-status/custom-status.php:757 msgid "Published" msgstr "" -#: common/php/class-module.php:244 modules/calendar/calendar.php:1245 modules/custom-status/custom-status.php:756 modules/dashboard/dashboard.php:181 +#: common/php/class-module.php:244 modules/calendar/calendar.php:1245 modules/custom-status/custom-status.php:779 modules/dashboard/dashboard.php:181 msgid "Scheduled" msgstr "" @@ -66,46 +66,110 @@ msgstr "" msgid "Unable to connect to the filesystem. Please confirm your credentials." msgstr "" -#: libraries/Notifications/Plugin.php:41 +#: libraries/Notifications/Plugin.php:42 msgid "Notification Workflows" msgstr "" -#: libraries/Notifications/Plugin.php:42 libraries/Notifications/Plugin.php:47 +#: libraries/Notifications/Plugin.php:43 libraries/Notifications/Plugin.php:48 msgid "Notification Workflow" msgstr "" -#: libraries/Notifications/Plugin.php:43 +#: libraries/Notifications/Plugin.php:44 msgid "Add New Notification Workflow" msgstr "" -#: libraries/Notifications/Plugin.php:44 +#: libraries/Notifications/Plugin.php:45 msgid "Edit Notification Workflow" msgstr "" -#: libraries/Notifications/Plugin.php:45 +#: libraries/Notifications/Plugin.php:46 msgid "Search Workflows" msgstr "" -#: libraries/Notifications/Plugin.php:46 libraries/Notifications/Plugin.php:75 modules/improved-notifications/improved-notifications.php:81 modules/notifications/notifications.php:61 +#: libraries/Notifications/Plugin.php:47 libraries/Notifications/Plugin.php:76 modules/improved-notifications/improved-notifications.php:81 modules/notifications/notifications.php:61 msgid "Notifications" msgstr "" -#: libraries/Notifications/Plugin.php:48 libraries/Notifications/Plugin.php:49 +#: libraries/Notifications/Plugin.php:49 libraries/Notifications/Plugin.php:50 msgid "No Workflow found" msgstr "" -#: libraries/Notifications/Plugin.php:76 +#: libraries/Notifications/Plugin.php:77 msgid "Notification" msgstr "" -#: libraries/Notifications/Plugin.php:161 libraries/Notifications/Plugin.php:182 +#: libraries/Notifications/Plugin.php:162 libraries/Notifications/Plugin.php:183 msgid "-" msgstr "" -#: libraries/Notifications/Plugin.php:195 +#: libraries/Notifications/Plugin.php:207 +msgid "M j, Y @ H:i" +msgstr "" + +#: libraries/Notifications/Plugin.php:209 libraries/Notifications/Plugin.php:210 msgid "Notification workflow updated." msgstr "" +#: libraries/Notifications/Plugin.php:211 +msgid "Notification workflow published." +msgstr "" + +#: libraries/Notifications/Plugin.php:212 +msgid "Notification workflow saved." +msgstr "" + +#: libraries/Notifications/Plugin.php:213 +msgid "Notification workflow submitted." +msgstr "" + +#: libraries/Notifications/Plugin.php:214 +#, php-format +msgid "Notification workflow scheduled for: %s." +msgstr "" + +#: libraries/Notifications/Plugin.php:215 +msgid "Notification workflow draft updated." +msgstr "" + +#: libraries/Notifications/Plugin.php:236 +#, php-format +msgid "%s notification workflow updated." +msgid_plural "%s notification workflows updated." +msgstr[0] "" +msgstr[1] "" + +#: libraries/Notifications/Plugin.php:237 +msgid "1 notification workflow not updated, somebody is editing it." +msgstr "" + +#: libraries/Notifications/Plugin.php:238 +#, php-format +msgid "%s notification workflow not updated, somebody is editing it." +msgid_plural "%s notification workflows not updated, somebody is editing them." +msgstr[0] "" +msgstr[1] "" + +#: libraries/Notifications/Plugin.php:239 +#, php-format +msgid "%s notification workflow permanently deleted." +msgid_plural "%s notification workflows permanently deleted." +msgstr[0] "" +msgstr[1] "" + +#: libraries/Notifications/Plugin.php:240 +#, php-format +msgid "%s notification workflow moved to the Trash." +msgid_plural "%s notification workflows moved to the Trash." +msgstr[0] "" +msgstr[1] "" + +#: libraries/Notifications/Plugin.php:241 +#, php-format +msgid "%s notification workflow restored from the Trash." +msgid_plural "%s notification workflows restored from the Trash." +msgstr[0] "" +msgstr[1] "" + #: libraries/Notifications/Table/Base.php:165 msgid "List View" msgstr "" @@ -267,7 +331,7 @@ msgstr "" msgid "Email" msgstr "" -#: libraries/Notifications/Workflow/Step/Content/Main.php:26 modules/calendar/calendar.php:921 modules/improved-notifications/improved-notifications.php:438 +#: libraries/Notifications/Workflow/Step/Content/Main.php:26 modules/calendar/calendar.php:921 modules/improved-notifications/improved-notifications.php:462 msgid "Content" msgstr "" @@ -532,7 +596,7 @@ msgstr "" msgid "Create" msgstr "" -#: modules/calendar/calendar.php:928 modules/calendar/calendar.php:1143 modules/content-overview/content-overview.php:673 modules/custom-status/custom-status.php:2127 modules/custom-status/custom-status.php:2383 +#: modules/calendar/calendar.php:928 modules/calendar/calendar.php:1143 modules/content-overview/content-overview.php:673 modules/custom-status/custom-status.php:2172 modules/custom-status/custom-status.php:2428 #: modules/editorial-metadata/editorial-metadata.php:2007 modules/user-groups/user-groups.php:1254 msgid "Edit" msgstr "" @@ -549,12 +613,12 @@ msgstr "" msgid "Trash this item" msgstr "" -#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2203 +#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2248 #, php-format msgid "Preview “%s”" msgstr "" -#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2203 +#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2248 msgid "Preview" msgstr "" @@ -644,11 +708,11 @@ msgstr "" msgid "The number of weeks shown on the calendar can be changed on a user-by-user basis using the calendar's screen options." msgstr "" -#: modules/calendar/calendar.php:1664 modules/custom-status/custom-status.php:1534 modules/dashboard/dashboard.php:291 modules/dashboard/dashboard.php:312 modules/dashboard/dashboard.php:341 +#: modules/calendar/calendar.php:1664 modules/custom-status/custom-status.php:1579 modules/dashboard/dashboard.php:291 modules/dashboard/dashboard.php:312 modules/dashboard/dashboard.php:341 msgid "Disabled" msgstr "" -#: modules/calendar/calendar.php:1665 modules/custom-status/custom-status.php:1535 modules/dashboard/dashboard.php:292 modules/dashboard/dashboard.php:313 modules/dashboard/dashboard.php:342 +#: modules/calendar/calendar.php:1665 modules/custom-status/custom-status.php:1580 modules/dashboard/dashboard.php:292 modules/dashboard/dashboard.php:313 modules/dashboard/dashboard.php:342 msgid "Enabled" msgstr "" @@ -656,51 +720,51 @@ msgstr "" msgid "Regenerate calendar feed secret" msgstr "" -#: modules/calendar/calendar.php:1758 +#: modules/calendar/calendar.php:1760 msgid "No date supplied." msgstr "" -#: modules/calendar/calendar.php:1768 +#: modules/calendar/calendar.php:1770 msgid "Please change Quick Create to use a post type viewable on the calendar." msgstr "" -#: modules/calendar/calendar.php:1776 +#: modules/calendar/calendar.php:1778 msgid "Untitled" msgstr "" -#: modules/calendar/calendar.php:1815 +#: modules/calendar/calendar.php:1817 msgid "Post could not be created" msgstr "" -#: modules/calendar/calendar.php:1908 +#: modules/calendar/calendar.php:1910 msgid "Invalid metadata type" msgstr "" -#: modules/calendar/calendar.php:1917 +#: modules/calendar/calendar.php:1919 msgid "Metadata could not be updated." msgstr "" -#: modules/calendar/calendar.php:1991 +#: modules/calendar/calendar.php:1993 msgid "All statuses" msgstr "" -#: modules/calendar/calendar.php:2004 +#: modules/calendar/calendar.php:2006 msgid "All categories" msgstr "" -#: modules/calendar/calendar.php:2017 +#: modules/calendar/calendar.php:2019 msgid "All tags" msgstr "" -#: modules/calendar/calendar.php:2031 +#: modules/calendar/calendar.php:2033 msgid "All users" msgstr "" -#: modules/calendar/calendar.php:2044 +#: modules/calendar/calendar.php:2046 msgid "All types" msgstr "" -#: modules/calendar/calendar.php:2064 +#: modules/calendar/calendar.php:2066 #, php-format msgid "%s week" msgid_plural "%s weeks" @@ -723,7 +787,7 @@ msgstr "" msgid "Screen Layout" msgstr "" -#: modules/content-overview/content-overview.php:262 modules/custom-status/custom-status.php:1125 +#: modules/content-overview/content-overview.php:262 modules/custom-status/custom-status.php:1170 msgid "Status" msgstr "" @@ -755,7 +819,7 @@ msgstr[1] "" msgid "Change" msgstr "" -#: modules/content-overview/content-overview.php:439 modules/custom-status/custom-status.php:1662 modules/editorial-comments/editorial-comments.php:245 modules/editorial-metadata/editorial-metadata.php:1732 +#: modules/content-overview/content-overview.php:439 modules/custom-status/custom-status.php:1707 modules/editorial-comments/editorial-comments.php:245 modules/editorial-metadata/editorial-metadata.php:1732 #: modules/editorial-metadata/editorial-metadata.php:2051 modules/editorial-metadata/editorial-metadata.php:2052 modules/user-groups/user-groups.php:596 msgid "Cancel" msgstr "" @@ -857,229 +921,229 @@ msgstr "" msgid "

For more information:

Custom Status Documentation

PublishPress on Github

" msgstr "" -#: modules/custom-status/custom-status.php:156 +#: modules/custom-status/custom-status.php:155 msgid "Pitch" msgstr "" -#: modules/custom-status/custom-status.php:159 +#: modules/custom-status/custom-status.php:158 msgid "Idea proposed; waiting for acceptance." msgstr "" -#: modules/custom-status/custom-status.php:166 +#: modules/custom-status/custom-status.php:165 msgid "Assigned" msgstr "" -#: modules/custom-status/custom-status.php:169 +#: modules/custom-status/custom-status.php:168 msgid "Post idea assigned to writer." msgstr "" -#: modules/custom-status/custom-status.php:176 +#: modules/custom-status/custom-status.php:175 msgid "In Progress" msgstr "" -#: modules/custom-status/custom-status.php:179 +#: modules/custom-status/custom-status.php:178 msgid "Writer is working on the post." msgstr "" -#: modules/custom-status/custom-status.php:189 +#: modules/custom-status/custom-status.php:188 msgid "Post is a draft; not ready for review or publication." msgstr "" -#: modules/custom-status/custom-status.php:199 +#: modules/custom-status/custom-status.php:198 msgid "Post needs to be reviewed by an editor." msgstr "" -#: modules/custom-status/custom-status.php:360 +#: modules/custom-status/custom-status.php:383 msgid "Are you sure you want to delete the post status? All posts with this status will be assigned to the default status." msgstr "" -#: modules/custom-status/custom-status.php:392 +#: modules/custom-status/custom-status.php:415 msgid "Note: Your browser does not support JavaScript or has JavaScript disabled. You will not be able to access or change the post status." msgstr "" -#: modules/custom-status/custom-status.php:745 +#: modules/custom-status/custom-status.php:768 msgid "Privately Published" msgstr "" -#: modules/custom-status/custom-status.php:828 +#: modules/custom-status/custom-status.php:851 msgid "— No Change —" msgstr "" -#: modules/custom-status/custom-status.php:891 +#: modules/custom-status/custom-status.php:914 msgid "Custom status doesn't exist." msgstr "" -#: modules/custom-status/custom-status.php:942 +#: modules/custom-status/custom-status.php:965 msgid "Cannot reassign to the status you want to delete" msgstr "" -#: modules/custom-status/custom-status.php:965 +#: modules/custom-status/custom-status.php:988 msgid "Restricted status " msgstr "" -#: modules/custom-status/custom-status.php:1205 modules/custom-status/custom-status.php:1289 +#: modules/custom-status/custom-status.php:1250 modules/custom-status/custom-status.php:1334 msgid "Please enter a name for the status" msgstr "" -#: modules/custom-status/custom-status.php:1209 modules/custom-status/custom-status.php:1293 +#: modules/custom-status/custom-status.php:1254 modules/custom-status/custom-status.php:1338 msgid "Please enter a valid, non-numeric name for the status." msgstr "" -#: modules/custom-status/custom-status.php:1213 modules/custom-status/custom-status.php:1297 +#: modules/custom-status/custom-status.php:1258 modules/custom-status/custom-status.php:1342 msgid "Status name cannot exceed 20 characters. Please try a shorter name." msgstr "" -#: modules/custom-status/custom-status.php:1217 modules/custom-status/custom-status.php:1308 +#: modules/custom-status/custom-status.php:1262 modules/custom-status/custom-status.php:1353 msgid "Status name conflicts with existing term. Please choose another." msgstr "" -#: modules/custom-status/custom-status.php:1221 modules/custom-status/custom-status.php:1318 +#: modules/custom-status/custom-status.php:1266 modules/custom-status/custom-status.php:1363 msgid "Status name is restricted. Please choose another name." msgstr "" -#: modules/custom-status/custom-status.php:1239 +#: modules/custom-status/custom-status.php:1284 msgid "Could not add status: " msgstr "" -#: modules/custom-status/custom-status.php:1314 +#: modules/custom-status/custom-status.php:1359 msgid "Status name conflicts with existing status. Please choose another." msgstr "" -#: modules/custom-status/custom-status.php:1337 +#: modules/custom-status/custom-status.php:1382 msgid "Error updating post status." msgstr "" -#: modules/custom-status/custom-status.php:1371 modules/custom-status/custom-status.php:1408 +#: modules/custom-status/custom-status.php:1416 modules/custom-status/custom-status.php:1453 msgid "Invalid nonce for submission." msgstr "" -#: modules/custom-status/custom-status.php:1376 modules/custom-status/custom-status.php:1413 +#: modules/custom-status/custom-status.php:1421 modules/custom-status/custom-status.php:1458 msgid "Sorry, you do not have permission to edit custom statuses." msgstr "" -#: modules/custom-status/custom-status.php:1388 +#: modules/custom-status/custom-status.php:1433 msgid "Status doesn't exist." msgstr "" -#: modules/custom-status/custom-status.php:1420 +#: modules/custom-status/custom-status.php:1465 msgid "Status does not exist." msgstr "" -#: modules/custom-status/custom-status.php:1425 +#: modules/custom-status/custom-status.php:1470 msgid "Cannot delete default status." msgstr "" -#: modules/custom-status/custom-status.php:1430 +#: modules/custom-status/custom-status.php:1475 msgid "Could not delete the status: " msgstr "" -#: modules/custom-status/custom-status.php:1486 modules/editorial-metadata/editorial-metadata.php:1506 +#: modules/custom-status/custom-status.php:1531 modules/editorial-metadata/editorial-metadata.php:1506 msgid "Terms not set." msgstr "" -#: modules/custom-status/custom-status.php:1511 +#: modules/custom-status/custom-status.php:1556 msgid "Use on these post types:" msgstr "" -#: modules/custom-status/custom-status.php:1512 +#: modules/custom-status/custom-status.php:1557 msgid "Show the status dropdown menu on the post editing screen:" msgstr "" -#: modules/custom-status/custom-status.php:1607 +#: modules/custom-status/custom-status.php:1652 msgid "Custom Status" msgstr "" -#: modules/custom-status/custom-status.php:1611 modules/custom-status/custom-status.php:1724 +#: modules/custom-status/custom-status.php:1656 modules/custom-status/custom-status.php:1769 msgid "The name is used to identify the status. (Max: 20 characters)" msgstr "" -#: modules/custom-status/custom-status.php:1616 modules/editorial-metadata/editorial-metadata.php:1673 modules/editorial-metadata/editorial-metadata.php:1788 +#: modules/custom-status/custom-status.php:1661 modules/editorial-metadata/editorial-metadata.php:1673 modules/editorial-metadata/editorial-metadata.php:1788 msgid "Slug" msgstr "" -#: modules/custom-status/custom-status.php:1621 +#: modules/custom-status/custom-status.php:1666 msgid "The slug is the unique ID for the status and is changed when the name is changed." msgstr "" -#: modules/custom-status/custom-status.php:1626 modules/custom-status/custom-status.php:1728 modules/custom-status/custom-status.php:2284 modules/editorial-metadata/editorial-metadata.php:1683 modules/editorial-metadata/editorial-metadata.php:1798 +#: modules/custom-status/custom-status.php:1671 modules/custom-status/custom-status.php:1773 modules/custom-status/custom-status.php:2329 modules/editorial-metadata/editorial-metadata.php:1683 modules/editorial-metadata/editorial-metadata.php:1798 #: modules/editorial-metadata/editorial-metadata.php:1937 modules/editorial-metadata/editorial-metadata.php:2045 modules/user-groups/user-groups.php:585 modules/user-groups/user-groups.php:656 modules/user-groups/user-groups.php:1224 msgid "Description" msgstr "" -#: modules/custom-status/custom-status.php:1631 modules/custom-status/custom-status.php:1734 +#: modules/custom-status/custom-status.php:1676 modules/custom-status/custom-status.php:1779 msgid "The description is primarily for administrative use, to give you some context on what the custom status is to be used for." msgstr "" -#: modules/custom-status/custom-status.php:1636 modules/custom-status/custom-status.php:1738 +#: modules/custom-status/custom-status.php:1681 modules/custom-status/custom-status.php:1783 msgid "Color" msgstr "" -#: modules/custom-status/custom-status.php:1642 modules/custom-status/custom-status.php:1745 +#: modules/custom-status/custom-status.php:1687 modules/custom-status/custom-status.php:1790 msgid "The color is used to identify the status." msgstr "" -#: modules/custom-status/custom-status.php:1647 modules/custom-status/custom-status.php:1749 modules/custom-status/custom-status.php:2285 +#: modules/custom-status/custom-status.php:1692 modules/custom-status/custom-status.php:1794 modules/custom-status/custom-status.php:2330 msgid "Icon" msgstr "" -#: modules/custom-status/custom-status.php:1653 modules/custom-status/custom-status.php:1758 +#: modules/custom-status/custom-status.php:1698 modules/custom-status/custom-status.php:1803 msgid "The icon is used to visually represent the status." msgstr "" -#: modules/custom-status/custom-status.php:1659 +#: modules/custom-status/custom-status.php:1704 msgid "Update Status" msgstr "" -#: modules/custom-status/custom-status.php:1689 modules/editorial-metadata/editorial-metadata.php:1747 modules/user-groups/user-groups.php:617 +#: modules/custom-status/custom-status.php:1734 modules/editorial-metadata/editorial-metadata.php:1747 modules/user-groups/user-groups.php:617 msgid "Add New" msgstr "" -#: modules/custom-status/custom-status.php:1695 modules/editorial-metadata/editorial-metadata.php:1753 modules/user-groups/user-groups.php:623 +#: modules/custom-status/custom-status.php:1740 modules/editorial-metadata/editorial-metadata.php:1753 modules/user-groups/user-groups.php:623 msgid "Options" msgstr "" -#: modules/custom-status/custom-status.php:1702 +#: modules/custom-status/custom-status.php:1747 msgid "Please note that checking a box will apply all statuses to that post type." msgstr "" -#: modules/custom-status/custom-status.php:1718 modules/custom-status/custom-status.php:2283 modules/editorial-metadata/editorial-metadata.php:1665 modules/editorial-metadata/editorial-metadata.php:1778 modules/editorial-metadata/editorial-metadata.php:1935 +#: modules/custom-status/custom-status.php:1763 modules/custom-status/custom-status.php:2328 modules/editorial-metadata/editorial-metadata.php:1665 modules/editorial-metadata/editorial-metadata.php:1778 modules/editorial-metadata/editorial-metadata.php:1935 #: modules/editorial-metadata/editorial-metadata.php:2040 modules/user-groups/user-groups.php:577 modules/user-groups/user-groups.php:646 modules/user-groups/user-groups.php:1223 msgid "Name" msgstr "" -#: modules/custom-status/custom-status.php:1765 +#: modules/custom-status/custom-status.php:1810 msgid "Add New Status" msgstr "" -#: modules/custom-status/custom-status.php:2093 modules/custom-status/custom-status.php:2124 +#: modules/custom-status/custom-status.php:2138 modules/custom-status/custom-status.php:2169 msgid "Permalink:" msgstr "" -#: modules/custom-status/custom-status.php:2104 +#: modules/custom-status/custom-status.php:2149 msgid "Change Permalinks" msgstr "" -#: modules/custom-status/custom-status.php:2127 +#: modules/custom-status/custom-status.php:2172 msgid "Edit permalink" msgstr "" -#: modules/custom-status/custom-status.php:2266 +#: modules/custom-status/custom-status.php:2311 msgid "No custom statuses found." msgstr "" -#: modules/custom-status/custom-status.php:2282 modules/editorial-metadata/editorial-metadata.php:1934 +#: modules/custom-status/custom-status.php:2327 modules/editorial-metadata/editorial-metadata.php:1934 msgid "Position" msgstr "" -#: modules/custom-status/custom-status.php:2370 +#: modules/custom-status/custom-status.php:2415 msgid "Default" msgstr "" -#: modules/custom-status/custom-status.php:2385 +#: modules/custom-status/custom-status.php:2430 msgid "Make Default" msgstr "" -#: modules/custom-status/custom-status.php:2389 modules/editorial-metadata/editorial-metadata.php:2014 modules/user-groups/user-groups.php:1255 +#: modules/custom-status/custom-status.php:2434 modules/editorial-metadata/editorial-metadata.php:2014 modules/user-groups/user-groups.php:1255 msgid "Delete" msgstr "" @@ -1624,91 +1688,91 @@ msgstr "" msgid "Improved Notifications for PublishPress" msgstr "" -#: modules/improved-notifications/improved-notifications.php:196 -msgid "Notify when posts are saved" +#: modules/improved-notifications/improved-notifications.php:207 +msgid "Notify when content is published" msgstr "" -#: modules/improved-notifications/improved-notifications.php:205 +#: modules/improved-notifications/improved-notifications.php:242 msgid "Notify on editorial comments" msgstr "" -#: modules/improved-notifications/improved-notifications.php:372 +#: modules/improved-notifications/improved-notifications.php:396 msgid "Workflow Settings" msgstr "" -#: modules/improved-notifications/improved-notifications.php:381 +#: modules/improved-notifications/improved-notifications.php:405 msgid "Help" msgstr "" -#: modules/improved-notifications/improved-notifications.php:400 +#: modules/improved-notifications/improved-notifications.php:424 msgid "When to notify?" msgstr "" -#: modules/improved-notifications/improved-notifications.php:408 +#: modules/improved-notifications/improved-notifications.php:432 msgid "Who to notify?" msgstr "" -#: modules/improved-notifications/improved-notifications.php:416 +#: modules/improved-notifications/improved-notifications.php:440 msgid "What to say?" msgstr "" -#: modules/improved-notifications/improved-notifications.php:437 +#: modules/improved-notifications/improved-notifications.php:461 msgid "You can add dynamic information to the Subject or Body text using the following shortcodes:" msgstr "" -#: modules/improved-notifications/improved-notifications.php:439 +#: modules/improved-notifications/improved-notifications.php:463 msgid "Editorial Comment" msgstr "" -#: modules/improved-notifications/improved-notifications.php:440 +#: modules/improved-notifications/improved-notifications.php:464 msgid "User making changes or comments" msgstr "" -#: modules/improved-notifications/improved-notifications.php:441 +#: modules/improved-notifications/improved-notifications.php:465 msgid "Workflow" msgstr "" -#: modules/improved-notifications/improved-notifications.php:442 +#: modules/improved-notifications/improved-notifications.php:466 msgid "Format" msgstr "" -#: modules/improved-notifications/improved-notifications.php:443 +#: modules/improved-notifications/improved-notifications.php:467 msgid "shortcode" msgstr "" -#: modules/improved-notifications/improved-notifications.php:444 +#: modules/improved-notifications/improved-notifications.php:468 msgid "field" msgstr "" -#: modules/improved-notifications/improved-notifications.php:445 +#: modules/improved-notifications/improved-notifications.php:469 msgid "On each shortcode, you can select one or more fields. If more than one, they will be displayed separated by \", \"." msgstr "" -#: modules/improved-notifications/improved-notifications.php:446 +#: modules/improved-notifications/improved-notifications.php:470 msgid "Available fields" msgstr "" -#: modules/improved-notifications/improved-notifications.php:447 +#: modules/improved-notifications/improved-notifications.php:471 msgid "Read more..." msgstr "" -#: modules/improved-notifications/improved-notifications.php:546 modules/improved-notifications/improved-notifications.php:560 +#: modules/improved-notifications/improved-notifications.php:570 modules/improved-notifications/improved-notifications.php:584 msgid "Muted" msgstr "" -#: modules/improved-notifications/improved-notifications.php:558 +#: modules/improved-notifications/improved-notifications.php:582 msgid "Editorial Notifications" msgstr "" -#: modules/improved-notifications/improved-notifications.php:559 +#: modules/improved-notifications/improved-notifications.php:583 msgid "Choose the channels where each workflow will send notifications to:" msgstr "" -#: modules/improved-notifications/improved-notifications.php:561 +#: modules/improved-notifications/improved-notifications.php:585 msgid "Workflows" msgstr "" -#: modules/improved-notifications/improved-notifications.php:562 +#: modules/improved-notifications/improved-notifications.php:586 msgid "Channels" msgstr "" From 4c7dc78d53082146530d2ea4f2be2fbf8830797f Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 15:33:40 -0300 Subject: [PATCH 10/13] Update version to 1.7.2 --- src/includes.php | 2 +- src/publishpress.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/includes.php b/src/includes.php index 13d178d93..0ff44f263 100644 --- a/src/includes.php +++ b/src/includes.php @@ -40,7 +40,7 @@ ); // Define contants - define( 'PUBLISHPRESS_VERSION', '1.7.2a1' ); + define( 'PUBLISHPRESS_VERSION', '1.7.2' ); define( 'PUBLISHPRESS_ROOT', dirname( __FILE__ ) ); define( 'PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_ROOT . '/' . basename( __FILE__ ) ); define( 'PUBLISHPRESS_URL', plugins_url( '/', __FILE__ ) ); diff --git a/src/publishpress.php b/src/publishpress.php index 2c1d26aea..ef05eeb91 100644 --- a/src/publishpress.php +++ b/src/publishpress.php @@ -5,7 +5,7 @@ * Description: The essential plugin for any WordPress site with multiple writers * Author: PressShack * Author URI: https://pressshack.com - * Version: 1.7.2a1 + * Version: 1.7.2 * * Copyright (c) 2017 PressShack * From 461fc8911a19dbbc8d11a30a0570e21dee096c4f Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 16:36:30 -0300 Subject: [PATCH 11/13] Add little warning if no post types are selected on the calendar settings --- src/common/css/publishpress-admin.css | 4 + src/includes.php | 2 +- src/languages/publishpress.pot | 292 ++++++++++---------------- src/modules/calendar/calendar.php | 24 +++ src/publishpress.php | 2 +- 5 files changed, 144 insertions(+), 180 deletions(-) diff --git a/src/common/css/publishpress-admin.css b/src/common/css/publishpress-admin.css index 1076d4360..701438fd1 100644 --- a/src/common/css/publishpress-admin.css +++ b/src/common/css/publishpress-admin.css @@ -156,3 +156,7 @@ Status color box */ .pp-status-color + strong { margin-left: 5px; } + +.psppca_field_warning { + font-style: italic; +} diff --git a/src/includes.php b/src/includes.php index 0ff44f263..13d178d93 100644 --- a/src/includes.php +++ b/src/includes.php @@ -40,7 +40,7 @@ ); // Define contants - define( 'PUBLISHPRESS_VERSION', '1.7.2' ); + define( 'PUBLISHPRESS_VERSION', '1.7.2a1' ); define( 'PUBLISHPRESS_ROOT', dirname( __FILE__ ) ); define( 'PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_ROOT . '/' . basename( __FILE__ ) ); define( 'PUBLISHPRESS_URL', plugins_url( '/', __FILE__ ) ); diff --git a/src/languages/publishpress.pot b/src/languages/publishpress.pot index 59d8d5efd..84fbc7a3b 100644 --- a/src/languages/publishpress.pot +++ b/src/languages/publishpress.pot @@ -3,7 +3,7 @@ msgid "" msgstr "" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" "Project-Id-Version: PublishPress\n" -"POT-Creation-Date: 2017-08-31 13:30-0300\n" +"POT-Creation-Date: 2017-08-29 15:36-0300\n" "PO-Revision-Date: 2016-04-22 07:37+0800\n" "Last-Translator: \n" "Language-Team: \n" @@ -26,19 +26,19 @@ msgstr "" msgid "Page" msgstr "" -#: common/php/class-module.php:178 common/php/class-module.php:243 libraries/Notifications/Traits/PublishPress_Module.php:50 modules/custom-status/custom-status.php:185 +#: common/php/class-module.php:178 common/php/class-module.php:243 libraries/Notifications/Traits/PublishPress_Module.php:50 modules/custom-status/custom-status.php:186 msgid "Draft" msgstr "" -#: common/php/class-module.php:184 common/php/class-module.php:246 libraries/Notifications/Traits/PublishPress_Module.php:56 modules/custom-status/custom-status.php:195 +#: common/php/class-module.php:184 common/php/class-module.php:246 libraries/Notifications/Traits/PublishPress_Module.php:56 modules/custom-status/custom-status.php:196 msgid "Pending Review" msgstr "" -#: common/php/class-module.php:242 modules/calendar/calendar.php:1250 modules/custom-status/custom-status.php:757 +#: common/php/class-module.php:242 modules/calendar/calendar.php:1250 modules/custom-status/custom-status.php:734 msgid "Published" msgstr "" -#: common/php/class-module.php:244 modules/calendar/calendar.php:1245 modules/custom-status/custom-status.php:779 modules/dashboard/dashboard.php:181 +#: common/php/class-module.php:244 modules/calendar/calendar.php:1245 modules/custom-status/custom-status.php:756 modules/dashboard/dashboard.php:181 msgid "Scheduled" msgstr "" @@ -66,110 +66,46 @@ msgstr "" msgid "Unable to connect to the filesystem. Please confirm your credentials." msgstr "" -#: libraries/Notifications/Plugin.php:42 +#: libraries/Notifications/Plugin.php:41 msgid "Notification Workflows" msgstr "" -#: libraries/Notifications/Plugin.php:43 libraries/Notifications/Plugin.php:48 +#: libraries/Notifications/Plugin.php:42 libraries/Notifications/Plugin.php:47 msgid "Notification Workflow" msgstr "" -#: libraries/Notifications/Plugin.php:44 +#: libraries/Notifications/Plugin.php:43 msgid "Add New Notification Workflow" msgstr "" -#: libraries/Notifications/Plugin.php:45 +#: libraries/Notifications/Plugin.php:44 msgid "Edit Notification Workflow" msgstr "" -#: libraries/Notifications/Plugin.php:46 +#: libraries/Notifications/Plugin.php:45 msgid "Search Workflows" msgstr "" -#: libraries/Notifications/Plugin.php:47 libraries/Notifications/Plugin.php:76 modules/improved-notifications/improved-notifications.php:81 modules/notifications/notifications.php:61 +#: libraries/Notifications/Plugin.php:46 libraries/Notifications/Plugin.php:75 modules/improved-notifications/improved-notifications.php:81 modules/notifications/notifications.php:61 msgid "Notifications" msgstr "" -#: libraries/Notifications/Plugin.php:49 libraries/Notifications/Plugin.php:50 +#: libraries/Notifications/Plugin.php:48 libraries/Notifications/Plugin.php:49 msgid "No Workflow found" msgstr "" -#: libraries/Notifications/Plugin.php:77 +#: libraries/Notifications/Plugin.php:76 msgid "Notification" msgstr "" -#: libraries/Notifications/Plugin.php:162 libraries/Notifications/Plugin.php:183 +#: libraries/Notifications/Plugin.php:161 libraries/Notifications/Plugin.php:182 msgid "-" msgstr "" -#: libraries/Notifications/Plugin.php:207 -msgid "M j, Y @ H:i" -msgstr "" - -#: libraries/Notifications/Plugin.php:209 libraries/Notifications/Plugin.php:210 +#: libraries/Notifications/Plugin.php:195 msgid "Notification workflow updated." msgstr "" -#: libraries/Notifications/Plugin.php:211 -msgid "Notification workflow published." -msgstr "" - -#: libraries/Notifications/Plugin.php:212 -msgid "Notification workflow saved." -msgstr "" - -#: libraries/Notifications/Plugin.php:213 -msgid "Notification workflow submitted." -msgstr "" - -#: libraries/Notifications/Plugin.php:214 -#, php-format -msgid "Notification workflow scheduled for: %s." -msgstr "" - -#: libraries/Notifications/Plugin.php:215 -msgid "Notification workflow draft updated." -msgstr "" - -#: libraries/Notifications/Plugin.php:236 -#, php-format -msgid "%s notification workflow updated." -msgid_plural "%s notification workflows updated." -msgstr[0] "" -msgstr[1] "" - -#: libraries/Notifications/Plugin.php:237 -msgid "1 notification workflow not updated, somebody is editing it." -msgstr "" - -#: libraries/Notifications/Plugin.php:238 -#, php-format -msgid "%s notification workflow not updated, somebody is editing it." -msgid_plural "%s notification workflows not updated, somebody is editing them." -msgstr[0] "" -msgstr[1] "" - -#: libraries/Notifications/Plugin.php:239 -#, php-format -msgid "%s notification workflow permanently deleted." -msgid_plural "%s notification workflows permanently deleted." -msgstr[0] "" -msgstr[1] "" - -#: libraries/Notifications/Plugin.php:240 -#, php-format -msgid "%s notification workflow moved to the Trash." -msgid_plural "%s notification workflows moved to the Trash." -msgstr[0] "" -msgstr[1] "" - -#: libraries/Notifications/Plugin.php:241 -#, php-format -msgid "%s notification workflow restored from the Trash." -msgid_plural "%s notification workflows restored from the Trash." -msgstr[0] "" -msgstr[1] "" - #: libraries/Notifications/Table/Base.php:165 msgid "List View" msgstr "" @@ -331,7 +267,7 @@ msgstr "" msgid "Email" msgstr "" -#: libraries/Notifications/Workflow/Step/Content/Main.php:26 modules/calendar/calendar.php:921 modules/improved-notifications/improved-notifications.php:462 +#: libraries/Notifications/Workflow/Step/Content/Main.php:26 modules/calendar/calendar.php:921 modules/improved-notifications/improved-notifications.php:438 msgid "Content" msgstr "" @@ -596,7 +532,7 @@ msgstr "" msgid "Create" msgstr "" -#: modules/calendar/calendar.php:928 modules/calendar/calendar.php:1143 modules/content-overview/content-overview.php:673 modules/custom-status/custom-status.php:2172 modules/custom-status/custom-status.php:2428 +#: modules/calendar/calendar.php:928 modules/calendar/calendar.php:1143 modules/content-overview/content-overview.php:673 modules/custom-status/custom-status.php:2127 modules/custom-status/custom-status.php:2383 #: modules/editorial-metadata/editorial-metadata.php:2007 modules/user-groups/user-groups.php:1254 msgid "Edit" msgstr "" @@ -613,12 +549,12 @@ msgstr "" msgid "Trash this item" msgstr "" -#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2248 +#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2203 #, php-format msgid "Preview “%s”" msgstr "" -#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2248 +#: modules/calendar/calendar.php:1148 modules/content-overview/content-overview.php:684 modules/custom-status/custom-status.php:2203 msgid "Preview" msgstr "" @@ -708,11 +644,11 @@ msgstr "" msgid "The number of weeks shown on the calendar can be changed on a user-by-user basis using the calendar's screen options." msgstr "" -#: modules/calendar/calendar.php:1664 modules/custom-status/custom-status.php:1579 modules/dashboard/dashboard.php:291 modules/dashboard/dashboard.php:312 modules/dashboard/dashboard.php:341 +#: modules/calendar/calendar.php:1664 modules/custom-status/custom-status.php:1534 modules/dashboard/dashboard.php:291 modules/dashboard/dashboard.php:312 modules/dashboard/dashboard.php:341 msgid "Disabled" msgstr "" -#: modules/calendar/calendar.php:1665 modules/custom-status/custom-status.php:1580 modules/dashboard/dashboard.php:292 modules/dashboard/dashboard.php:313 modules/dashboard/dashboard.php:342 +#: modules/calendar/calendar.php:1665 modules/custom-status/custom-status.php:1535 modules/dashboard/dashboard.php:292 modules/dashboard/dashboard.php:313 modules/dashboard/dashboard.php:342 msgid "Enabled" msgstr "" @@ -720,51 +656,51 @@ msgstr "" msgid "Regenerate calendar feed secret" msgstr "" -#: modules/calendar/calendar.php:1760 +#: modules/calendar/calendar.php:1758 msgid "No date supplied." msgstr "" -#: modules/calendar/calendar.php:1770 +#: modules/calendar/calendar.php:1768 msgid "Please change Quick Create to use a post type viewable on the calendar." msgstr "" -#: modules/calendar/calendar.php:1778 +#: modules/calendar/calendar.php:1776 msgid "Untitled" msgstr "" -#: modules/calendar/calendar.php:1817 +#: modules/calendar/calendar.php:1815 msgid "Post could not be created" msgstr "" -#: modules/calendar/calendar.php:1910 +#: modules/calendar/calendar.php:1908 msgid "Invalid metadata type" msgstr "" -#: modules/calendar/calendar.php:1919 +#: modules/calendar/calendar.php:1917 msgid "Metadata could not be updated." msgstr "" -#: modules/calendar/calendar.php:1993 +#: modules/calendar/calendar.php:1991 msgid "All statuses" msgstr "" -#: modules/calendar/calendar.php:2006 +#: modules/calendar/calendar.php:2004 msgid "All categories" msgstr "" -#: modules/calendar/calendar.php:2019 +#: modules/calendar/calendar.php:2017 msgid "All tags" msgstr "" -#: modules/calendar/calendar.php:2033 +#: modules/calendar/calendar.php:2031 msgid "All users" msgstr "" -#: modules/calendar/calendar.php:2046 +#: modules/calendar/calendar.php:2044 msgid "All types" msgstr "" -#: modules/calendar/calendar.php:2066 +#: modules/calendar/calendar.php:2064 #, php-format msgid "%s week" msgid_plural "%s weeks" @@ -787,7 +723,7 @@ msgstr "" msgid "Screen Layout" msgstr "" -#: modules/content-overview/content-overview.php:262 modules/custom-status/custom-status.php:1170 +#: modules/content-overview/content-overview.php:262 modules/custom-status/custom-status.php:1125 msgid "Status" msgstr "" @@ -819,7 +755,7 @@ msgstr[1] "" msgid "Change" msgstr "" -#: modules/content-overview/content-overview.php:439 modules/custom-status/custom-status.php:1707 modules/editorial-comments/editorial-comments.php:245 modules/editorial-metadata/editorial-metadata.php:1732 +#: modules/content-overview/content-overview.php:439 modules/custom-status/custom-status.php:1662 modules/editorial-comments/editorial-comments.php:245 modules/editorial-metadata/editorial-metadata.php:1732 #: modules/editorial-metadata/editorial-metadata.php:2051 modules/editorial-metadata/editorial-metadata.php:2052 modules/user-groups/user-groups.php:596 msgid "Cancel" msgstr "" @@ -921,229 +857,229 @@ msgstr "" msgid "

For more information:

Custom Status Documentation

PublishPress on Github

" msgstr "" -#: modules/custom-status/custom-status.php:155 +#: modules/custom-status/custom-status.php:156 msgid "Pitch" msgstr "" -#: modules/custom-status/custom-status.php:158 +#: modules/custom-status/custom-status.php:159 msgid "Idea proposed; waiting for acceptance." msgstr "" -#: modules/custom-status/custom-status.php:165 +#: modules/custom-status/custom-status.php:166 msgid "Assigned" msgstr "" -#: modules/custom-status/custom-status.php:168 +#: modules/custom-status/custom-status.php:169 msgid "Post idea assigned to writer." msgstr "" -#: modules/custom-status/custom-status.php:175 +#: modules/custom-status/custom-status.php:176 msgid "In Progress" msgstr "" -#: modules/custom-status/custom-status.php:178 +#: modules/custom-status/custom-status.php:179 msgid "Writer is working on the post." msgstr "" -#: modules/custom-status/custom-status.php:188 +#: modules/custom-status/custom-status.php:189 msgid "Post is a draft; not ready for review or publication." msgstr "" -#: modules/custom-status/custom-status.php:198 +#: modules/custom-status/custom-status.php:199 msgid "Post needs to be reviewed by an editor." msgstr "" -#: modules/custom-status/custom-status.php:383 +#: modules/custom-status/custom-status.php:360 msgid "Are you sure you want to delete the post status? All posts with this status will be assigned to the default status." msgstr "" -#: modules/custom-status/custom-status.php:415 +#: modules/custom-status/custom-status.php:392 msgid "Note: Your browser does not support JavaScript or has JavaScript disabled. You will not be able to access or change the post status." msgstr "" -#: modules/custom-status/custom-status.php:768 +#: modules/custom-status/custom-status.php:745 msgid "Privately Published" msgstr "" -#: modules/custom-status/custom-status.php:851 +#: modules/custom-status/custom-status.php:828 msgid "— No Change —" msgstr "" -#: modules/custom-status/custom-status.php:914 +#: modules/custom-status/custom-status.php:891 msgid "Custom status doesn't exist." msgstr "" -#: modules/custom-status/custom-status.php:965 +#: modules/custom-status/custom-status.php:942 msgid "Cannot reassign to the status you want to delete" msgstr "" -#: modules/custom-status/custom-status.php:988 +#: modules/custom-status/custom-status.php:965 msgid "Restricted status " msgstr "" -#: modules/custom-status/custom-status.php:1250 modules/custom-status/custom-status.php:1334 +#: modules/custom-status/custom-status.php:1205 modules/custom-status/custom-status.php:1289 msgid "Please enter a name for the status" msgstr "" -#: modules/custom-status/custom-status.php:1254 modules/custom-status/custom-status.php:1338 +#: modules/custom-status/custom-status.php:1209 modules/custom-status/custom-status.php:1293 msgid "Please enter a valid, non-numeric name for the status." msgstr "" -#: modules/custom-status/custom-status.php:1258 modules/custom-status/custom-status.php:1342 +#: modules/custom-status/custom-status.php:1213 modules/custom-status/custom-status.php:1297 msgid "Status name cannot exceed 20 characters. Please try a shorter name." msgstr "" -#: modules/custom-status/custom-status.php:1262 modules/custom-status/custom-status.php:1353 +#: modules/custom-status/custom-status.php:1217 modules/custom-status/custom-status.php:1308 msgid "Status name conflicts with existing term. Please choose another." msgstr "" -#: modules/custom-status/custom-status.php:1266 modules/custom-status/custom-status.php:1363 +#: modules/custom-status/custom-status.php:1221 modules/custom-status/custom-status.php:1318 msgid "Status name is restricted. Please choose another name." msgstr "" -#: modules/custom-status/custom-status.php:1284 +#: modules/custom-status/custom-status.php:1239 msgid "Could not add status: " msgstr "" -#: modules/custom-status/custom-status.php:1359 +#: modules/custom-status/custom-status.php:1314 msgid "Status name conflicts with existing status. Please choose another." msgstr "" -#: modules/custom-status/custom-status.php:1382 +#: modules/custom-status/custom-status.php:1337 msgid "Error updating post status." msgstr "" -#: modules/custom-status/custom-status.php:1416 modules/custom-status/custom-status.php:1453 +#: modules/custom-status/custom-status.php:1371 modules/custom-status/custom-status.php:1408 msgid "Invalid nonce for submission." msgstr "" -#: modules/custom-status/custom-status.php:1421 modules/custom-status/custom-status.php:1458 +#: modules/custom-status/custom-status.php:1376 modules/custom-status/custom-status.php:1413 msgid "Sorry, you do not have permission to edit custom statuses." msgstr "" -#: modules/custom-status/custom-status.php:1433 +#: modules/custom-status/custom-status.php:1388 msgid "Status doesn't exist." msgstr "" -#: modules/custom-status/custom-status.php:1465 +#: modules/custom-status/custom-status.php:1420 msgid "Status does not exist." msgstr "" -#: modules/custom-status/custom-status.php:1470 +#: modules/custom-status/custom-status.php:1425 msgid "Cannot delete default status." msgstr "" -#: modules/custom-status/custom-status.php:1475 +#: modules/custom-status/custom-status.php:1430 msgid "Could not delete the status: " msgstr "" -#: modules/custom-status/custom-status.php:1531 modules/editorial-metadata/editorial-metadata.php:1506 +#: modules/custom-status/custom-status.php:1486 modules/editorial-metadata/editorial-metadata.php:1506 msgid "Terms not set." msgstr "" -#: modules/custom-status/custom-status.php:1556 +#: modules/custom-status/custom-status.php:1511 msgid "Use on these post types:" msgstr "" -#: modules/custom-status/custom-status.php:1557 +#: modules/custom-status/custom-status.php:1512 msgid "Show the status dropdown menu on the post editing screen:" msgstr "" -#: modules/custom-status/custom-status.php:1652 +#: modules/custom-status/custom-status.php:1607 msgid "Custom Status" msgstr "" -#: modules/custom-status/custom-status.php:1656 modules/custom-status/custom-status.php:1769 +#: modules/custom-status/custom-status.php:1611 modules/custom-status/custom-status.php:1724 msgid "The name is used to identify the status. (Max: 20 characters)" msgstr "" -#: modules/custom-status/custom-status.php:1661 modules/editorial-metadata/editorial-metadata.php:1673 modules/editorial-metadata/editorial-metadata.php:1788 +#: modules/custom-status/custom-status.php:1616 modules/editorial-metadata/editorial-metadata.php:1673 modules/editorial-metadata/editorial-metadata.php:1788 msgid "Slug" msgstr "" -#: modules/custom-status/custom-status.php:1666 +#: modules/custom-status/custom-status.php:1621 msgid "The slug is the unique ID for the status and is changed when the name is changed." msgstr "" -#: modules/custom-status/custom-status.php:1671 modules/custom-status/custom-status.php:1773 modules/custom-status/custom-status.php:2329 modules/editorial-metadata/editorial-metadata.php:1683 modules/editorial-metadata/editorial-metadata.php:1798 +#: modules/custom-status/custom-status.php:1626 modules/custom-status/custom-status.php:1728 modules/custom-status/custom-status.php:2284 modules/editorial-metadata/editorial-metadata.php:1683 modules/editorial-metadata/editorial-metadata.php:1798 #: modules/editorial-metadata/editorial-metadata.php:1937 modules/editorial-metadata/editorial-metadata.php:2045 modules/user-groups/user-groups.php:585 modules/user-groups/user-groups.php:656 modules/user-groups/user-groups.php:1224 msgid "Description" msgstr "" -#: modules/custom-status/custom-status.php:1676 modules/custom-status/custom-status.php:1779 +#: modules/custom-status/custom-status.php:1631 modules/custom-status/custom-status.php:1734 msgid "The description is primarily for administrative use, to give you some context on what the custom status is to be used for." msgstr "" -#: modules/custom-status/custom-status.php:1681 modules/custom-status/custom-status.php:1783 +#: modules/custom-status/custom-status.php:1636 modules/custom-status/custom-status.php:1738 msgid "Color" msgstr "" -#: modules/custom-status/custom-status.php:1687 modules/custom-status/custom-status.php:1790 +#: modules/custom-status/custom-status.php:1642 modules/custom-status/custom-status.php:1745 msgid "The color is used to identify the status." msgstr "" -#: modules/custom-status/custom-status.php:1692 modules/custom-status/custom-status.php:1794 modules/custom-status/custom-status.php:2330 +#: modules/custom-status/custom-status.php:1647 modules/custom-status/custom-status.php:1749 modules/custom-status/custom-status.php:2285 msgid "Icon" msgstr "" -#: modules/custom-status/custom-status.php:1698 modules/custom-status/custom-status.php:1803 +#: modules/custom-status/custom-status.php:1653 modules/custom-status/custom-status.php:1758 msgid "The icon is used to visually represent the status." msgstr "" -#: modules/custom-status/custom-status.php:1704 +#: modules/custom-status/custom-status.php:1659 msgid "Update Status" msgstr "" -#: modules/custom-status/custom-status.php:1734 modules/editorial-metadata/editorial-metadata.php:1747 modules/user-groups/user-groups.php:617 +#: modules/custom-status/custom-status.php:1689 modules/editorial-metadata/editorial-metadata.php:1747 modules/user-groups/user-groups.php:617 msgid "Add New" msgstr "" -#: modules/custom-status/custom-status.php:1740 modules/editorial-metadata/editorial-metadata.php:1753 modules/user-groups/user-groups.php:623 +#: modules/custom-status/custom-status.php:1695 modules/editorial-metadata/editorial-metadata.php:1753 modules/user-groups/user-groups.php:623 msgid "Options" msgstr "" -#: modules/custom-status/custom-status.php:1747 +#: modules/custom-status/custom-status.php:1702 msgid "Please note that checking a box will apply all statuses to that post type." msgstr "" -#: modules/custom-status/custom-status.php:1763 modules/custom-status/custom-status.php:2328 modules/editorial-metadata/editorial-metadata.php:1665 modules/editorial-metadata/editorial-metadata.php:1778 modules/editorial-metadata/editorial-metadata.php:1935 +#: modules/custom-status/custom-status.php:1718 modules/custom-status/custom-status.php:2283 modules/editorial-metadata/editorial-metadata.php:1665 modules/editorial-metadata/editorial-metadata.php:1778 modules/editorial-metadata/editorial-metadata.php:1935 #: modules/editorial-metadata/editorial-metadata.php:2040 modules/user-groups/user-groups.php:577 modules/user-groups/user-groups.php:646 modules/user-groups/user-groups.php:1223 msgid "Name" msgstr "" -#: modules/custom-status/custom-status.php:1810 +#: modules/custom-status/custom-status.php:1765 msgid "Add New Status" msgstr "" -#: modules/custom-status/custom-status.php:2138 modules/custom-status/custom-status.php:2169 +#: modules/custom-status/custom-status.php:2093 modules/custom-status/custom-status.php:2124 msgid "Permalink:" msgstr "" -#: modules/custom-status/custom-status.php:2149 +#: modules/custom-status/custom-status.php:2104 msgid "Change Permalinks" msgstr "" -#: modules/custom-status/custom-status.php:2172 +#: modules/custom-status/custom-status.php:2127 msgid "Edit permalink" msgstr "" -#: modules/custom-status/custom-status.php:2311 +#: modules/custom-status/custom-status.php:2266 msgid "No custom statuses found." msgstr "" -#: modules/custom-status/custom-status.php:2327 modules/editorial-metadata/editorial-metadata.php:1934 +#: modules/custom-status/custom-status.php:2282 modules/editorial-metadata/editorial-metadata.php:1934 msgid "Position" msgstr "" -#: modules/custom-status/custom-status.php:2415 +#: modules/custom-status/custom-status.php:2370 msgid "Default" msgstr "" -#: modules/custom-status/custom-status.php:2430 +#: modules/custom-status/custom-status.php:2385 msgid "Make Default" msgstr "" -#: modules/custom-status/custom-status.php:2434 modules/editorial-metadata/editorial-metadata.php:2014 modules/user-groups/user-groups.php:1255 +#: modules/custom-status/custom-status.php:2389 modules/editorial-metadata/editorial-metadata.php:2014 modules/user-groups/user-groups.php:1255 msgid "Delete" msgstr "" @@ -1688,91 +1624,91 @@ msgstr "" msgid "Improved Notifications for PublishPress" msgstr "" -#: modules/improved-notifications/improved-notifications.php:207 -msgid "Notify when content is published" +#: modules/improved-notifications/improved-notifications.php:196 +msgid "Notify when posts are saved" msgstr "" -#: modules/improved-notifications/improved-notifications.php:242 +#: modules/improved-notifications/improved-notifications.php:205 msgid "Notify on editorial comments" msgstr "" -#: modules/improved-notifications/improved-notifications.php:396 +#: modules/improved-notifications/improved-notifications.php:372 msgid "Workflow Settings" msgstr "" -#: modules/improved-notifications/improved-notifications.php:405 +#: modules/improved-notifications/improved-notifications.php:381 msgid "Help" msgstr "" -#: modules/improved-notifications/improved-notifications.php:424 +#: modules/improved-notifications/improved-notifications.php:400 msgid "When to notify?" msgstr "" -#: modules/improved-notifications/improved-notifications.php:432 +#: modules/improved-notifications/improved-notifications.php:408 msgid "Who to notify?" msgstr "" -#: modules/improved-notifications/improved-notifications.php:440 +#: modules/improved-notifications/improved-notifications.php:416 msgid "What to say?" msgstr "" -#: modules/improved-notifications/improved-notifications.php:461 +#: modules/improved-notifications/improved-notifications.php:437 msgid "You can add dynamic information to the Subject or Body text using the following shortcodes:" msgstr "" -#: modules/improved-notifications/improved-notifications.php:463 +#: modules/improved-notifications/improved-notifications.php:439 msgid "Editorial Comment" msgstr "" -#: modules/improved-notifications/improved-notifications.php:464 +#: modules/improved-notifications/improved-notifications.php:440 msgid "User making changes or comments" msgstr "" -#: modules/improved-notifications/improved-notifications.php:465 +#: modules/improved-notifications/improved-notifications.php:441 msgid "Workflow" msgstr "" -#: modules/improved-notifications/improved-notifications.php:466 +#: modules/improved-notifications/improved-notifications.php:442 msgid "Format" msgstr "" -#: modules/improved-notifications/improved-notifications.php:467 +#: modules/improved-notifications/improved-notifications.php:443 msgid "shortcode" msgstr "" -#: modules/improved-notifications/improved-notifications.php:468 +#: modules/improved-notifications/improved-notifications.php:444 msgid "field" msgstr "" -#: modules/improved-notifications/improved-notifications.php:469 +#: modules/improved-notifications/improved-notifications.php:445 msgid "On each shortcode, you can select one or more fields. If more than one, they will be displayed separated by \", \"." msgstr "" -#: modules/improved-notifications/improved-notifications.php:470 +#: modules/improved-notifications/improved-notifications.php:446 msgid "Available fields" msgstr "" -#: modules/improved-notifications/improved-notifications.php:471 +#: modules/improved-notifications/improved-notifications.php:447 msgid "Read more..." msgstr "" -#: modules/improved-notifications/improved-notifications.php:570 modules/improved-notifications/improved-notifications.php:584 +#: modules/improved-notifications/improved-notifications.php:546 modules/improved-notifications/improved-notifications.php:560 msgid "Muted" msgstr "" -#: modules/improved-notifications/improved-notifications.php:582 +#: modules/improved-notifications/improved-notifications.php:558 msgid "Editorial Notifications" msgstr "" -#: modules/improved-notifications/improved-notifications.php:583 +#: modules/improved-notifications/improved-notifications.php:559 msgid "Choose the channels where each workflow will send notifications to:" msgstr "" -#: modules/improved-notifications/improved-notifications.php:585 +#: modules/improved-notifications/improved-notifications.php:561 msgid "Workflows" msgstr "" -#: modules/improved-notifications/improved-notifications.php:586 +#: modules/improved-notifications/improved-notifications.php:562 msgid "Channels" msgstr "" diff --git a/src/modules/calendar/calendar.php b/src/modules/calendar/calendar.php index 9cf48f8b7..a74af30a7 100644 --- a/src/modules/calendar/calendar.php +++ b/src/modules/calendar/calendar.php @@ -51,6 +51,12 @@ class PP_Calendar extends PP_Module { */ const DEFAULT_NUM_WEEKS = 5; + /** + * Name of the transient option to flag the warning for selecting + * at least one post type + */ + const TRANSIENT_SHOW_ONE_POST_TYPE_WARNING = 'show_one_post_type_warning'; + /** * [$module description] * @@ -1642,6 +1648,13 @@ public function register_settings() { public function settings_post_types_option() { global $publishpress; $publishpress->settings->helper_option_custom_post_type( $this->module ); + + // Check if we need to display the message about selecting at lest one post type + if ( get_transient( static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING ) ) { + echo '

' . __( 'At least one post type must be selected', 'publishpress' ) . '

'; + + delete_transient( static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING ); + } } /** @@ -1699,11 +1712,22 @@ public function settings_validate( $new_options ) { break; } } + if ( $empty) { + // Check post by default $options['post_types'] = array( 'post' => 'on' ); + + // Add flag to display a warning to the user + set_transient( static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING, 1, 300 ); } else { $options['post_types'] = $this->clean_post_type_options( $new_options['post_types'], $this->module->post_type_support ); } + } else { + // Check post by default + $options['post_types'] = array( 'post' => 'on' ); + + // Add flag to display a warning to the user + set_transient( static::TRANSIENT_SHOW_ONE_POST_TYPE_WARNING, 1, 300 ); } if ( 'on' != $new_options['ics_subscription'] ) { diff --git a/src/publishpress.php b/src/publishpress.php index ef05eeb91..2c1d26aea 100644 --- a/src/publishpress.php +++ b/src/publishpress.php @@ -5,7 +5,7 @@ * Description: The essential plugin for any WordPress site with multiple writers * Author: PressShack * Author URI: https://pressshack.com - * Version: 1.7.2 + * Version: 1.7.2a1 * * Copyright (c) 2017 PressShack * From dbe842a227193b2cd04d76e30134363f8bfa41c1 Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 16:37:30 -0300 Subject: [PATCH 12/13] Update version to 1.7.2 --- src/includes.php | 2 +- src/publishpress.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/includes.php b/src/includes.php index 13d178d93..0ff44f263 100644 --- a/src/includes.php +++ b/src/includes.php @@ -40,7 +40,7 @@ ); // Define contants - define( 'PUBLISHPRESS_VERSION', '1.7.2a1' ); + define( 'PUBLISHPRESS_VERSION', '1.7.2' ); define( 'PUBLISHPRESS_ROOT', dirname( __FILE__ ) ); define( 'PUBLISHPRESS_FILE_PATH', PUBLISHPRESS_ROOT . '/' . basename( __FILE__ ) ); define( 'PUBLISHPRESS_URL', plugins_url( '/', __FILE__ ) ); diff --git a/src/publishpress.php b/src/publishpress.php index 2c1d26aea..ef05eeb91 100644 --- a/src/publishpress.php +++ b/src/publishpress.php @@ -5,7 +5,7 @@ * Description: The essential plugin for any WordPress site with multiple writers * Author: PressShack * Author URI: https://pressshack.com - * Version: 1.7.2a1 + * Version: 1.7.2 * * Copyright (c) 2017 PressShack * From 73679a7d09b5f09443348973eb66f016f9fbc35d Mon Sep 17 00:00:00 2001 From: Anderson Grudtner Martins Date: Thu, 31 Aug 2017 16:38:37 -0300 Subject: [PATCH 13/13] Update changelog --- src/readme.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/readme.txt b/src/readme.txt index 3fedaea23..f0d730b65 100644 --- a/src/readme.txt +++ b/src/readme.txt @@ -163,6 +163,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). * Fixed default notification workflows to avoid notifications on every post save, but only when the content transition to Published; * Fixed the message after delete workflows; * Fixed the notifications workflows to ignore autosaves; +* Fixed post type options in the calendar settings, selecting the Post post type by default, if nothing is selected - Displaying a warning; = [1.7.1] - 2017-08-30 =