Merge pull request #32 from WebDevStudios/bugfix/MAIN-184-fix-deprecation-errors

Bugfix/main 184 fix deprecation errors

Author: daveromsey

README.md

@@ -41,9 +41,12 @@ You will have to require it in e.g. `mu-plugins/wds-required-plugins-list.php`:
 require WPMU_PLUGIN_DIR . '/wds-required-plugins/wds-required-plugins.php';
 
 function wds_required_plugins_add( $required ) {
-    return array_merge( $required, array(
-        'my-plugin/my-plugin.php`,
-    ) );
+    return array_merge(
+      $required,
+      [
+        'my-plugin/my-plugin.php',
+      ]
+    );
 }
 add_filter( 'wds_network_required_plugins', 'wds_required_plugins_add' );
 
@@ -62,13 +65,13 @@ add_filter( 'wds_network_required_plugins', 'wds_required_plugins_add' );
  * @return array           Modified array of required plugins.
  */
 function wds_required_plugins_add( $required ) {
-
-	$required = array_merge( $required, array(
-		'jetpack/jetpack.php',
-		'sample-plugin/sample-plugin.php',
-	) );
-
-	return $required;
+  return array_merge(
+    $required,
+    [
+      'jetpack/jetpack.php',
+      'sample-plugin/sample-plugin.php',
+    ]
+  );
 }
 add_filter( 'wds_required_plugins', 'wds_required_plugins_add' );
 ```

languages/wds-required-plugins-es_ES.mo

@@ -2,26 +2,49 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WDS Required Plugins v0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2014-11-25 20:58:19+0000\n"
-"Last-Translator: Justin Sternberg <justin@dsgnwrks.pro>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2023-08-30 15:39+0000\n"
+"PO-Revision-Date: 2023-08-30 12:20-0400\n"
+"Last-Translator: Dave Romsey\n"
+"Language-Team: Spanish (Spain)\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.7beta3\n"
-"X-Poedit-Language: \n"
-"X-Poedit-Country: \n"
+"X-Generator: Poedit 3.1.1\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_n:1,2;__ngettext_noop:1,2;_n_noop:1,2;_c,_nc:4c,1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;_nx_noop:4c,1,2;\n"
-"X-Poedit-Basepath: \n"
-"X-Poedit-Bookmarks: \n"
+"X-Poedit-KeywordsList: __;_e;__ngettext:1,2;_n:1,2;__ngettext_noop:1,2;"
+"_n_noop:1,2;_c,_nc:4c,1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;_nx_noop:4c,1,2\n"
+"X-Textdomain-Support: yes\n"
+"X-Loco-Version: 2.6.4; wp-6.3\n"
 "X-Poedit-SearchPath-0: .\n"
-"X-Textdomain-Support: yes"
 
-#: wds-required-plugins.php:85
-#@ wds-required-plugins
-msgid "WDS Required Plugin"
+#. Description of the plugin
+msgid "Forcefully require specific plugins to be activated."
+msgstr "Requiere forzosamente que se activen plugins específicos."
+
+#. Plugin URI of the plugin
+#. Author URI of the plugin
+msgid "http://webdevstudios.com"
+msgstr "http://webdevstudios.com"
+
+#: wds-required-plugins.php:355
+msgid "Required Plugin"
+msgstr "Plugin Requerido"
+
+#. translators: %1 and %2 are explained below. Set default log text.
+#: wds-required-plugins.php:317
+msgid "Required Plugin auto-activation failed for: %1$s, with message: %2$s"
+msgstr ""
+"La activación automática del plugin requerido falló para: %1$s, con mensaje: "
+"%2$s"
+
+#. Plugin Name of the plugin
+#, fuzzy
+#| msgid "WDS Required Plugin"
+msgid "WDS Required Plugins"
 msgstr "WDS Plugin Obligatorio"
 
+#. Author of the plugin
+msgid "WebDevStudios"
+msgstr "WebDevStudios"

languages/wds-required-plugins-es_ES.po

@@ -0,0 +1,41 @@
+# Copyright (C) 2023 WebDevStudios
+# This file is distributed under the GPLv2.
+msgid ""
+msgstr ""
+"Project-Id-Version: WDS Required Plugins 1.3.0\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wds-required-plugins\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2023-08-30T15:17:01+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.7.1\n"
+"X-Domain: wds-required-plugins\n"
+
+#. Plugin Name of the plugin
+msgid "WDS Required Plugins"
+msgstr ""
+
+#. Plugin URI of the plugin
+#. Author URI of the plugin
+msgid "http://webdevstudios.com"
+msgstr ""
+
+#. Description of the plugin
+msgid "Forcefully require specific plugins to be activated."
+msgstr ""
+
+#. Author of the plugin
+msgid "WebDevStudios"
+msgstr ""
+
+#. translators: %1 and %2 are explained below. Set default log text.
+#: wds-required-plugins.php:317
+msgid "Required Plugin auto-activation failed for: %1$s, with message: %2$s"
+msgstr ""
+
+#: wds-required-plugins.php:355
+msgid "Required Plugin"
+msgstr ""

languages/wds-required-plugins.pot

@@ -5,10 +5,10 @@
  * Description: Forcefully require specific plugins to be activated.
  * Author:      WebDevStudios
  * Author URI:  http://webdevstudios.com
- * Version:     1.2.1
- * Domain:      wds-required-plugins
+ * Version:     1.3.0
+ * Text Domain: wds-required-plugins
+ * Domain Path: /languages
  * License:     GPLv2
- * Path:        languages
  * Props:       1.0.0 - Patrick Garman, Justin Sternberg, Brad Parbs
  *
  * @package     WDS_Required_Plugins
@@ -126,7 +126,7 @@ private function __construct() {
 		add_filter( 'all_plugins', [ $this, 'maybe_remove_plugins_from_list' ] );
 
 		// Load text domain.
-		add_action( 'plugins_loaded', [ $this, 'l10n' ] );
+		add_action( 'init', [ $this, 'l10n' ] );
 	}
 
 	/**
@@ -388,8 +388,8 @@ public function required_text_markup() {
 	 *
 	 * @return array
 	 */
-	public function filter_plugin_links( $actions = [], $plugin ) {
-
+	public function filter_plugin_links( $actions, $plugin ) {
+		$actions = (array) $actions;
 		// Get our required plugins for network + normal.
 		$required_plugins = array_unique( array_merge( $this->get_required_plugins(), $this->get_network_required_plugins() ) );
 
@@ -595,20 +595,22 @@ public function l10n() {
 			return;
 		}
 
+		$languages_path = dirname( plugin_basename( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'languages';
+
 		// Try to load mu-plugin textdomain.
-		if ( load_muplugin_textdomain( 'wds-required-plugins', '/languages/' ) ) {
+		if ( load_muplugin_textdomain( 'wds-required-plugins', $languages_path ) ) {
 			self::$l10n_done = true;
 			return;
 		}
 
 		// If we didn't load, load as a plugin.
-		if ( load_plugin_textdomain( 'wds-required-plugins', false, '/languages/' ) ) {
+		if ( load_plugin_textdomain( 'wds-required-plugins', false, $languages_path ) ) {
 			self::$l10n_done = true;
 			return;
 		}
 
 		// If we didn't load yet, load as a theme.
-		if ( load_theme_textdomain( 'wds-required-plugins', '/languages/' ) ) {
+		if ( load_theme_textdomain( 'wds-required-plugins', dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 'languages' ) ) {
 			self::$l10n_done = true;
 			return;
 		}