Ticket #30972: 30972.patch

tools/i18n/extract.php

@@ -170 +170 @@
                                 continue;
                         }
                         if ( T_COMMENT == $id ) {
+                                $text = preg_replace( '%^\s+\*\s%m', '', $text );
+                                $text = str_replace( array( "\r\n", "\n" ), ' ', $text );;
                                 $text = trim( preg_replace( '%^/\*|//%', '', preg_replace( '%\*/$%', '', $text ) ) );
                                 if ( 0 === stripos( $text, $this->comment_prefix ) ) {
                                         $latest_comment = $text;

tools/i18n/t/ExtractTest.php

@@ -152 +152 @@
                         $this->extractor->find_function_calls( array('f'), '<?php /* translators: boo */ /* translators: let your ears fly! */ /* baba */ $foo = g ( f( "baba" ) ); ' ) );
         }
 
+        function test_find_function_calls_with_multi_line_comment() {
+                $this->assertEquals( array( array(
+                                'name' => 'f', 'args' => array( 'baba' ), 'line' => 6,
+                                'comment' => "Translators: If there are characters in your language that are not supported by Lato, translate this to 'off'. Do not translate into your own language."
+                        ) ),
+                        $this->extractor->find_function_calls( array('f'),
+                                "<?php
+                                /*
+                                 * Translators: If there are characters in your language that are not supported
+                                 * by Lato, translate this to 'off'. Do not translate into your own language.
+                                 */
+                                f( 'baba' );"
+                        )
+                );
+        }
+
         function test_comment_prefix_should_be_case_insensitive() {
                 $this->assertEquals(
                         array( array( 'name' => 'f', 'args' => array( 'baba' ), 'line' => 1, 'comment' => 'Translators: let your ears fly!' ) ),