Merge branch 'press11-171' of github.com:newfold-labs/wp-module-patte…

…rns into press11-171

composer.json

@@ -46,7 +46,7 @@
 		"i18n-po": "vendor/bin/wp i18n update-po ./languages/nfd-wonder-blocks.pot ./languages",
 		"i18n-mo": "vendor/bin/wp i18n make-mo ./languages",
 		"i18n-php": "vendor/bin/wp i18n make-php ./languages",
-		"i18n-json": "rm -f languages/*.json && vendor/bin/wp i18n make-json ./languages --no-purge --pretty-print",
+		"i18n-json": "find ./languages -name \"*.json\" -exec rm {} \\; && vendor/bin/wp i18n make-json ./languages --no-purge --pretty-print",
 		"i18n": [
 		  "@i18n-pot",
 		  "@i18n-po",

includes/Library/Admin.php

@@ -26,6 +26,8 @@ public function __construct() {
 
 		\add_action( 'init', array( PluginService::class, 'setup' ) );
 		\add_action( 'init', array( __CLASS__, 'load_text_domain' ), 100 );
+
+		\add_filter( 'load_script_translation_file', array( __CLASS__, 'load_script_translation_file' ), 10, 3 );
 	}
 
 	/**
@@ -76,15 +78,34 @@ public static function register_assets() {
 				)
 			);
 
+			\wp_set_script_translations(
+				'nfd-wonder-blocks',
+				'nfd-wonder-blocks',
+				NFD_WONDER_BLOCKS_DIR . '/languages'
+			);
+
 			\wp_enqueue_script( 'nfd-wonder-blocks' );
 			\wp_enqueue_style( 'nfd-wonder-blocks' );
 		}
+	}
 
-		\wp_set_script_translations(
-			'nfd-wonder-blocks',
-			'nfd-wonder-blocks',
-			NFD_WONDER_BLOCKS_DIR . '/languages'
-		);
+	/**
+	 * Filter default WP script translations file to load the correct one
+	 *
+	 * @param string $file The translations file.
+	 * @param string $handle Script handle.
+	 * @param string $domain The strings textdomain.
+	 * @return string
+	 */
+	public static function load_script_translation_file( $file, $handle, $domain ) {
+
+		if ( 'nfd-wonder-blocks' === $handle ) {
+			$locale = determine_locale();
+			$key    = md5( 'build/' . NFD_WONDER_BLOCKS_VERSION . '/wonder-blocks.js' );
+			$file   = NFD_WONDER_BLOCKS_DIR . "/languages/{$domain}-{$locale}-{$key}.json";
+		}
+
+		return $file;
 	}
 
 	/**
@@ -181,5 +202,4 @@ public static function load_text_domain() {
 			NFD_WONDER_BLOCKS_DIR . '/languages'
 		);
 	}
-
 }