Ticket #31179: 31179.patch

tools/i18n/makepot.php

@@ -237 +237 @@
                 return $this->wp_generic( $dir, array(
                         'project' => 'wp-core', 'output' => $output,
                         'extract_not_gettexted' => true,
-                        'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
+                        'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
                 ) );
         }
 
@@ -246 +246 @@
 
                 return $this->wp_generic( $dir, array(
                         'project' => 'wp-frontend', 'output' => $output,
-                        'includes' => array(), 'excludes' => array( 'wp-admin/.*', 'wp-content/themes/.*' ),
+                        'includes' => array(), 'excludes' => array( 'wp-includes/class-pop3\.php', 'wp-admin/.*', 'wp-content/themes/.*' ),
                         'default_output' => 'wordpress.pot',
                 ) );
         }
@@ -263 +263 @@
 
                 $result = $this->wp_generic( $dir, array(
                         'project' => 'wp-admin', 'output' => $output,
-                        'includes' => array( 'wp-admin/.*' ), 'excludes' => array( 'wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php' ),
+                        'includes' => array( 'wp-admin/.*' ),
+                        'excludes' => array( 'wp-admin/includes/continents-cities\.php', 'wp-admin/network/.*', 'wp-admin/network.php' ),
                         'default_output' => 'wordpress-admin.pot',
                 ) );
 
                 if ( ! $result )
                         return false;
 
-                $potextmeta = new PotExtMeta;
-                $result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
+                $potextmeta = new PotExtMeta;
+                $result = $potextmeta->append( "$dir/wp-content/plugins/akismet/akismet.php", $output );
                 if ( ! $result )
                         return false;
                 $result = $potextmeta->append( "$dir/wp-content/plugins/hello.php", $output );
                 if ( ! $result )
                         return false;
-                /* Adding non-gettexted strings can repeat some phrases */
-                $output_shell = escapeshellarg($output);
-                system("msguniq $output_shell -o $output_shell");
 
+                /* Adding non-gettexted strings can repeat some phrases */
+                $output_shell = escapeshellarg($output);
+                system("msguniq $output_shell -o $output_shell");
+
                 $common_pot = $this->tempnam( 'common.pot' );
                 if ( ! $common_pot )
                         return false;