Ticket #3748: 3748.3.diff

wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/i18n/class-code-import.php

@@ -42 +42 @@
                         throw new Exception( 'Plugin is not compatible with language packs: ' . $valid->get_error_message() );
                 }
 
-                if ( ! class_exists( '\PotExtMeta' ) ) {
-                        require_once plugin_dir_path( \WordPressdotorg\Plugin_Directory\PLUGIN_FILE ) . 'libs/i18n-tools/makepot.php';
-                }
-
                 $pot_file = "{$tmp_directory}/{$this->plugin}-code.pot";
-                $makepot  = new \MakePOT();
 
-                if ( ! $makepot->wp_plugin( $export_directory, $pot_file, $this->plugin ) || ! file_exists( $pot_file ) ) {
+                exec(
+                        sprintf(
+                                'wp i18n make-pot %s %s --slug=%s',
+                                escapeshellarg( $export_directory ),
+                                escapeshellarg( $pot_file ),
+                                escapeshellarg( $this->plugin )
+                        ),
+                        $output,
+                        $return_code
+                );
+
+                if ( $return_code !== 0 || ! file_exists( $pot_file ) ) {
                         throw new Exception( "POT file couldn't be created." );
                 }