Merge pull request #875 from sillsdev/develop

Fix javascript sprintf error introduced in WordPress 6.9

Author: phillip-hopper

.idea/php.xml

@@ -44,7 +44,7 @@
     "ext-simplexml": "*",
     "ext-zlib": "*",
     "kcs/class-finder": "^0.6",
-    "johnpbloch/wordpress": "^6.7",
+    "johnpbloch/wordpress": "v6.9",
     "mdsimpson/contact-form-7-to-database-extension": "@stable",
     "mongodb/mongodb": "@stable",
     "phpoffice/phpspreadsheet": "^1.17",

.idea/webonary.iml

@@ -4,7 +4,8 @@ thisDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 wordpress_dir="${thisDir}/wordpress-develop"
 
 if [[ ! -d "${wordpress_dir}" ]]; then
-  git clone --depth 1 -b trunk git://develop.git.wordpress.org/ "${wordpress_dir}"
+  #git clone --depth 1 -b trunk git://develop.git.wordpress.org/ "${wordpress_dir}"
+  git clone --depth 1 -b 6.9.1 git://develop.git.wordpress.org/ "${wordpress_dir}"
 else
   cd "${wordpress_dir}"
   git pull

composer-deploy.json

@@ -0,0 +1,12 @@
+
+document.addEventListener('DOMContentLoaded', () => {
+
+    // Make sure sprintf is available
+    window.setTimeout(() => {
+
+        if (typeof window.sprintf === 'undefined' && typeof wp.i18n.sprintf === 'function')
+            window.sprintf = wp.i18n.sprintf;
+
+    }, 500);
+});
+

get-wordpress-files.sh

@@ -43,6 +43,15 @@ public static function IsAdminAllowed(): bool
 
 	public static function EnqueueAdminScripts(): void
 	{
+		wp_register_script(
+			'webonary_old_admin_script',
+			WBNY_PLUGIN_URL . 'js/admin_script.js',
+			[],
+			false,
+			true
+		);
+		wp_enqueue_script('webonary_old_admin_script');
+
 		wp_register_script(
 			'webonary_admin_script',
 			WBNY_PLUGIN_URL . 'js/webonary-admin.js',

plugins/sil/sil-dictionary-webonary/js/webonary-final.js

@@ -48,6 +48,8 @@ private static function SetAdminHooks(): int
 		 */
 		$hooks_set += (int)add_filter('monsterinsights_show_dashboard_widget', '__return_false');
 
+		$hooks_set += (int)add_action('admin_enqueue_scripts', [Webonary_Utility::class, 'EnqueueFinalJs'], 999995);
+
 		return $hooks_set;
 	}
 
@@ -90,6 +92,8 @@ private static function SetAllPageHooks(): int
 
 //		$hooks_set += (int)add_action('switch_blog', 'SIL\Webonary\Dictionaries::BlogWasSwitched');
 
+		$hooks_set += (int)add_action('wp_enqueue_scripts', [Webonary_Utility::class, 'EnqueueFinalJs'], 999995);
+
 		return $hooks_set;
 	}
 

plugins/sil/sil-dictionary-webonary/src/Admin.php

@@ -568,6 +568,18 @@ public static function EnqueueJsAndCss()
 		}
 	}
 
+	public static function EnqueueFinalJs()
+	{
+		wp_register_script(
+			'webonary_final_script',
+			WBNY_PLUGIN_URL . 'js/webonary-final.js',
+			[],
+			false,
+			true
+		);
+		wp_enqueue_script('webonary_final_script');
+	}
+
 	/**
 	 * Returns the $_GET[$variable_name] value as a string
 	 * @param string $variable_name