Ticket #42818: 42818.2.diff

tools/i18n/not-gettexted.php

@@ -68 +68 @@
 
 
         function make_string_aggregator($global_array_name, $filename) {
-                $a = $global_array_name;
-                return create_function('$string, $comment_id, $line_number', 'global $'.$a.'; $'.$a.'[] = array($string, $comment_id, '.var_export($filename, true).', $line_number);');
+                return array( new NotGettexted_Aggregator( $global_array_name, $filename ), 'aggregate' );
         }
 
         function make_mo_replacer($global_mo_name) {
-                $m = $global_mo_name;
-                return create_function('$token, $string', 'global $'.$m.'; return var_export($'.$m.'->translate($string), true);');
+                return array( new NotGettexted_Replacer( $global_mo_name ), 'replace' );
         }
 
         function walk_tokens(&$tokens, $string_action, $other_action, $register_action=null) {
@@ -222 +220 @@
         }
 }
 
+class NotGettexted_Aggregator {
+        private $global_array_name;
+        private $filename;
+
+        public function __construct( $global_array_name, $filename ) {
+                $this->global_array_name = $global_array_name;
+                $this->filename = $filename;
+        }
+
+        public function aggregate( $string, $comment_id, $line_number ) {
+                if ( ! is_array( $GLOBALS[ $this->global_array_name ] ) ) {
+                        $GLOBALS[ $this->global_array_name ] = array();
+                }
+                $GLOBALS[ $this->global_array_name ] []= array( $string, $comment_id, $this->filename, $line_number );
+        }
+}
+
+class NotGettexted_Replacer {
+        private $global_mo_name;
+
+        public function __construct( $global_mo_name ) {
+                $this->global_mo_name = $global_mo_name;
+        }
+
+        public function replace( $token, $string ) {
+                if ( ! empty( $GLOBALS[ $this->global_mo_name ] ) ) {
+                        $mo = &$GLOBALS[ $this->global_mo_name ];
+                        if ( is_object( $mo ) && method_exists( $mo, 'translate' ) ) {
+                                return var_export( $mo->translate( $string ), true );
+                        }
+                }
+        }
+}
+
 // run the CLI only if the file
 // wasn't included
 $included_files = get_included_files();

tools/i18n/t/NotGettextedTest.php

@@ -10 +10 @@
 
 class NotGettextedTest extends PHPUnit_Framework_TestCase {
 
-        function __construct() {
+        function setUp() {
+                parent::setUp();
                 $this->ng = new NotGettexted;
         }
 

tools/i18n/t/data/not-gettexted-0.po

@@ -11 +11 @@
 
 #. Not gettexted string WP_I18N_CONFIG
 #: not-gettext-0.php:11
-msgid " There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>"
-msgstr "Translation: There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>"
+msgid " There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>"
+msgstr "Translation: There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='https://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='%s' class='button'>Create a Configuration File</a>"
 
 #. Not gettexted string WP_I18N_ERROR
 #: not-gettext-0.php:11