Changeset 36781

Timestamp:

02/29/2016 08:44:31 PM (9 years ago)

Author:

ocean90

Message:

i18n tools: In StringExtractor don't strip slashes from URLs.

Props SergeyBiryukov, ocean90.
Fixes #36015.

Location:

trunk/tools/i18n

Files:

• extract.php (modified) (1 diff)
• t/ExtractTest.php (modified) (1 diff)

trunk/tools/i18n/extract.php

@@ -173 +173 @@
                 $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;

trunk/tools/i18n/t/ExtractTest.php

@@ -187 +187 @@
      * @group comment
      */
+    function test_find_function_calls_with_c_style_comment() {
+        $this->assertEquals( array( array(
+                'name' => '__', 'args' => array( 'on' ), 'line' => 3,
+                'comment' => 'translators: let your ears fly!'
+            ) ),
+            $this->extractor->find_function_calls( array( '__' ),
+                "<?php
+                // translators: let your ears fly!
+                __( 'on' );"
+            )
+        );
+    }
+
+    /**
+     * @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(