Merge pull request #215 from ocean90/patch-1

Trim tab characters from comment lines

src/Utils/ParsedComment.php

@@ -59,8 +59,8 @@ public static function create($value, $line)
                 return null;
             }
 
-            $line = ltrim($line, '#*/ ');
-            $line = rtrim($line, '#*/ ');
+            $line = ltrim($line, "#*/ \t");
+            $line = rtrim($line, "#*/ \t");
 
             return trim($line);
         }, explode("\n", $value));

tests/AssetsTest.php

@@ -307,7 +307,7 @@ public function testPhpCode2()
                 'CONTEXT' => 'my-context',
             ],
         ]);
-        $countTranslations = 13;
+        $countTranslations = 14;
         $countTranslated = 0;
         $countHeaders = 8;
 

tests/assets/phpcode2/Csv.csv

@@ -20,3 +20,4 @@ my-context,"All comments",
 ,"i18n tagged %s",
 ,foo,
 ,bar,
+,"foo bar",

tests/assets/phpcode2/CsvDictionary.csv

@@ -11,3 +11,4 @@ plain,
 "i18n tagged %s",
 foo,
 bar,
+"foo bar",

tests/assets/phpcode2/Jed.json

@@ -43,6 +43,9 @@
         ],
         "bar": [
             ""
+        ],
+        "foo bar": [
+            ""
         ]
     }
 }

tests/assets/phpcode2/Json.json

@@ -41,6 +41,9 @@
             ],
             "bar": [
                 ""
+            ],
+            "foo bar": [
+                ""
             ]
         },
         "my-context": {

tests/assets/phpcode2/JsonDictionary.json

@@ -11,5 +11,6 @@
     "One comment": "",
     "i18n tagged %s": "",
     "foo": "",
-    "bar": ""
+    "bar": "",
+    "foo bar": ""
 }

tests/assets/phpcode2/PhpArray.php

@@ -65,6 +65,10 @@
       array (
         0 => '',
       ),
+      'foo bar' => 
+      array (
+        0 => '',
+      ),
     ),
     'my-context' => 
     array (

tests/assets/phpcode2/Po.po

@@ -70,3 +70,8 @@ msgstr ""
 #: ./tests/assets/phpcode2/input.php:44
 msgid "bar"
 msgstr ""
+
+#. translators: this comment is indented with a tab.
+#: ./tests/assets/phpcode2/input.php:51
+msgid "foo bar"
+msgstr ""

tests/assets/phpcode2/Xliff.xlf

@@ -149,5 +149,16 @@
         <target></target>
       </segment>
     </unit>
+    <unit id="327b6f07435811239bc47e1544353273">
+      <notes>
+        <note category="context"></note>
+        <note category="extracted-comment">translators: this comment is indented with a tab.</note>
+        <note category="reference">./tests/assets/phpcode2/input.php:51</note>
+      </notes>
+      <segment>
+        <source>foo bar</source>
+        <target></target>
+      </segment>
+    </unit>
   </file>
 </xliff>

tests/assets/phpcode2/Yaml.yml

@@ -16,5 +16,6 @@ messages:
     'i18n tagged %s': ''
     foo: ''
     bar: ''
+    'foo bar': ''
   my-context:
     'All comments': ''

tests/assets/phpcode2/YamlDictionary.yml

@@ -11,3 +11,4 @@ plain: ''
 'i18n tagged %s': ''
 foo: ''
 bar: ''
+'foo bar': ''

tests/assets/phpcode2/input.php

@@ -41,4 +41,12 @@
  */
 __( 'foo' );
 
-/* translators: this should get extracted. */ $foo = __( 'bar' );
+/* translators: this should get extracted. */ $foo = __( 'bar' );
+
+function foo() {
+	/*
+	 * translators: this comment is
+	 * indented with a tab.
+	 */
+	__( 'foo bar' );
+}