Ticket #36015: 36015.2.patch

tools/i18n/extract.php

@@ -172 +172 @@
                         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 ) ) );
+                                $text = trim( preg_replace( '%^(/\*|//)%', '', preg_replace( '%\*/$%', '', $text ) ) );
                                 if ( 0 === stripos( $text, $this->comment_prefix ) ) {
                                         $latest_comment = $text;
                                 }

tools/i18n/t/ExtractTest.php

@@ -186 +186 @@
         /**
          * @group comment
          */
+        function test_find_function_calls_with_url_in_comment() {
+                $this->assertEquals( array( array(
+                                'name' => '__', 'args' => array( 'F j, Y g:i a' ), 'line' => 3,
+                                'comment' => 'translators: localized date and time format, see http://php.net/date'
+                        ) ),
+                        $this->extractor->find_function_calls( array( '__' ),
+                                "<?php
+                                /* translators: localized date and time format, see http://php.net/date */
+                                __( 'F j, Y g:i a' );"
+                        )
+                );
+        }
+
+        /**
+         * @group comment
+         */
         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!' ) ),