Merge pull request #547 from publishpress/develop-3.1.1

Develop 3.1.1
publishpress · Oct 11, 2023 · ff86d03 · ff86d03
2 parents 33d84ed + a61370d
commit ff86d03
Show file tree

Hide file tree

Showing 43 changed files with 740 additions and 310 deletions.
diff --git a/.wordpress-org/icon-128x128.png b/.wordpress-org/icon-128x128.png
diff --git a/.wordpress-org/icon-256x256.png b/.wordpress-org/icon-256x256.png
diff --git a/assets/css/edit.css b/assets/css/edit.css
@@ -35,10 +35,6 @@ div.pe-qe-fields > div {
     color: #e08f63;
 }
 
-.post-expire-col .dashicons {
-    cursor: help;
-}
-
 .pe-qe-fields input.invalid {
     border: 2px solid #b15b5b;
     background-color: #ffdede;

diff --git a/assets/images/publishpress-future-256.png b/assets/images/publishpress-future-256.png
diff --git a/composer.lock b/composer.lock
diff --git a/dev-workspace/docker/compose.yaml b/dev-workspace/docker/compose.yaml
@@ -1,7 +1,7 @@
 name: devworkspace_future_free
 services:
     terminal:
-        build: ./docker
+        build: .
         image: publishpress/dev-workspace-terminal:future-free-2
         command: ["zsh"]
         stdin_open: true

diff --git a/languages/post-expirator.pot b/languages/post-expirator.pot
@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the PublishPress Future plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: PublishPress Future 3.1.0\n"
+"Project-Id-Version: PublishPress Future 3.1.1-beta.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/project\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-09-06T15:24:49+00:00\n"
+"POT-Creation-Date: 2023-09-28T14:45:54+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.8.1\n"
 "X-Domain: post-expirator\n"
@@ -116,7 +116,7 @@ msgstr ""
 
 #: legacy/classes/Facade.class.php:418
 #: src/Modules/Expirator/Tables/ScheduledActionsTable.php:44
-#: src/Modules/Settings/Controllers/Controller.php:187
+#: src/Modules/Settings/Controllers/Controller.php:179
 #: src/Views/bulk-edit.php:129
 #: src/Views/bulk-edit.php:131
 #: src/Views/classic-metabox.php:117
@@ -149,22 +149,34 @@ msgid "Future Action"
 msgstr ""
 
 #: legacy/functions.php:1167
-#: src/Modules/Settings/Controllers/Controller.php:200
+#: src/Modules/Settings/Controllers/Controller.php:192
 msgid "No taxonomies found"
 msgstr ""
 
-#: services.php:68
+#: services.php:69
 msgid "l F jS, Y"
 msgstr ""
 
-#: services.php:69
+#: services.php:70
 msgid "g:ia"
 msgstr ""
 
-#: services.php:70
+#: services.php:71
 msgid "Post expires at EXPIRATIONTIME on ACTIONDATE"
 msgstr ""
 
+#: src/Modules/Expirator/Controllers/BulkActionController.php:107
+msgid "No posts selected. Unable to sync Future Actions."
+msgstr ""
+
+#: src/Modules/Expirator/Controllers/BulkActionController.php:112
+msgid "Future Actions successfully synced with Post Metadata."
+msgstr ""
+
+#: src/Modules/Expirator/Controllers/BulkActionController.php:118
+msgid "Update Future Actions from Post Metadata"
+msgstr ""
+
 #: src/Modules/Expirator/Controllers/ScheduledActionsController.php:81
 msgid "Future"
 msgstr ""
@@ -274,27 +286,27 @@ msgstr ""
 msgid "Unstick"
 msgstr ""
 
-#: src/Modules/Expirator/Models/ExpirablePostModel.php:456
+#: src/Modules/Expirator/Models/ExpirablePostModel.php:457
 msgid "Email is disabled"
 msgstr ""
 
-#: src/Modules/Expirator/Models/ExpirablePostModel.php:460
+#: src/Modules/Expirator/Models/ExpirablePostModel.php:461
 msgid "Email sent"
 msgstr ""
 
-#: src/Modules/Expirator/Models/ExpirablePostModel.php:460
+#: src/Modules/Expirator/Models/ExpirablePostModel.php:461
 msgid "Email not sent"
 msgstr ""
 
-#: src/Modules/Expirator/Models/ExpirablePostModel.php:563
+#: src/Modules/Expirator/Models/ExpirablePostModel.php:579
 msgid "%s. %s on %s. The post link is %s"
 msgstr ""
 
-#: src/Modules/Expirator/Models/ExpirablePostModel.php:580
+#: src/Modules/Expirator/Models/ExpirablePostModel.php:596
 msgid "Future Action Complete \"%s\""
 msgstr ""
 
-#: src/Modules/Expirator/Models/ExpirablePostModel.php:583
+#: src/Modules/Expirator/Models/ExpirablePostModel.php:599
 msgid "[%1$s] %2$s"
 msgstr ""
 
@@ -362,97 +374,97 @@ msgstr ""
 msgid "Async"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:175
+#: src/Modules/Settings/Controllers/Controller.php:167
 msgid "Default Values"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:176
+#: src/Modules/Settings/Controllers/Controller.php:168
 msgid "Use the values below to set the default actions/values to be used for each for the corresponding post types.  These values can all be overwritten when creating/editing the post/page."
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:180
-#: src/Modules/Settings/Controllers/Controller.php:181
+#: src/Modules/Settings/Controllers/Controller.php:172
+#: src/Modules/Settings/Controllers/Controller.php:173
 msgid "Active"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:182
+#: src/Modules/Settings/Controllers/Controller.php:174
 msgid "Inactive"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:183
+#: src/Modules/Settings/Controllers/Controller.php:175
 msgid "Select whether the PublishPress Future meta box is active for this post type."
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:188
+#: src/Modules/Settings/Controllers/Controller.php:180
 msgid "Select the default action for the post type."
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:192
+#: src/Modules/Settings/Controllers/Controller.php:184
 msgid "Auto-enable?"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:193
+#: src/Modules/Settings/Controllers/Controller.php:185
 #: src/Views/menu-diagnostics.php:62
 #: src/Views/menu-display.php:81
 #: src/Views/menu-general.php:145
 #: src/Views/menu-general.php:170
 msgid "Enabled"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:194
+#: src/Modules/Settings/Controllers/Controller.php:186
 #: src/Views/menu-diagnostics.php:82
 #: src/Views/menu-display.php:86
 #: src/Views/menu-general.php:152
 #: src/Views/menu-general.php:178
 msgid "Disabled"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:195
+#: src/Modules/Settings/Controllers/Controller.php:187
 msgid "Select whether the PublishPress Future is enabled for all new posts."
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:199
+#: src/Modules/Settings/Controllers/Controller.php:191
 msgid "Taxonomy (Hierarchical)"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:201
+#: src/Modules/Settings/Controllers/Controller.php:193
 msgid "Select the hierarchical taxonomy and terms to be used for taxonomy based expiration."
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:205
+#: src/Modules/Settings/Controllers/Controller.php:197
 #: src/Views/menu-general.php:189
 msgid "Who to Notify"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:206
+#: src/Modules/Settings/Controllers/Controller.php:198
 msgid "Enter a comma separate list of emails that you would like to be notified when the action runs."
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:210
+#: src/Modules/Settings/Controllers/Controller.php:202
 #: src/Views/menu-general.php:101
 msgid "Default Date/Time Offset"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:213
+#: src/Modules/Settings/Controllers/Controller.php:205
 msgid ""
 "Set the offset to use for the default action date and time. For information on formatting, see %1$s\n"
 "                                    . For example, you could enter %2$s+1 month%3$s or %4$s+1 week 2 days 4 hours 2 seconds%5$s or %6$snext Thursday%7$s. Please, use only terms in English."
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:218
+#: src/Modules/Settings/Controllers/Controller.php:210
 #: src/Views/menu-general.php:115
 msgid "PHP strtotime function"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:229
+#: src/Modules/Settings/Controllers/Controller.php:221
 msgid "Default terms:"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:230
+#: src/Modules/Settings/Controllers/Controller.php:222
 msgid "Save changes"
 msgstr ""
 
-#: src/Modules/Settings/Controllers/Controller.php:303
+#: src/Modules/Settings/Controllers/Controller.php:295
 msgid "Form Validation Failure: Sorry, your nonce did not verify."
 msgstr ""
 
@@ -568,18 +580,10 @@ msgstr ""
 msgid "More than 1 hierarchical taxonomy detected.  You must assign a default taxonomy on the settings screen."
 msgstr ""
 
-#: src/Views/expire-column.php:31
-msgid "Cron event scheduled."
-msgstr ""
-
 #: src/Views/expire-column.php:37
 msgid "%1$s%2$s%3$s on %5$s%4$s%6$s"
 msgstr ""
 
-#: src/Views/expire-column.php:63
-msgid "This action will can not run correctly."
-msgstr ""
-
 #: src/Views/expire-column.php:64
 msgid "Action could not be scheduled due to a configuration issue. Please attempt to schedule it again."
 msgstr ""

diff --git a/legacy/debug.php b/legacy/debug.php
@@ -1,7 +1,6 @@
 <?php
 
 use PublishPress\Future\Core\DI\Container;
-use PublishPress\Future\Core\DI\ContainerNotInitializedException;
 use PublishPress\Future\Core\DI\ServicesAbstract as Services;
 use PublishPress\Future\Modules\Debug\DebugInterface;
 
@@ -21,7 +20,6 @@ class PostExpiratorDebug
 
     /**
      * Constructor.
-     * @throws ContainerNotInitializedException
      */
     public function __construct()
     {

diff --git a/lib/composer.lock b/lib/composer.lock