Merge pull request #296 from swissspidy/fix/empty-comment-lines

oscarotero · web-flow · commit 7d98aba7dfdb · 2024-05-18T12:20:02.000+02:00
4.x: Fix parsing of PO files without empty lines
diff --git a/src/Extractors/Po.php b/src/Extractors/Po.php
@@ -29,6 +29,10 @@ public static function fromString($string, Translations $translations, array $op
             $line = trim($lines[$i]);
             $line = static::fixMultiLines($line, $lines, $i);
 
+            if ($line === "#") {
+                $line = "";
+            }
+
             if ($line === '') {
                 if ($translation->is('', '')) {
                     static::extractHeaders($translation->getTranslation(), $translations);
diff --git a/tests/AssetsTest.php b/tests/AssetsTest.php
@@ -89,13 +89,13 @@ public function testPo2()
     public function testPo3()
     {
         $translations = static::get('po3/input', 'Po');
-        $countTranslations = 8;
-        $countTranslated = 8;
+        $countTranslations = 10;
+        $countTranslated = 10;
         $countHeaders = 8;
 
         $this->assertCount($countTranslations, $translations);
         $this->assertCount($countHeaders, $translations->getHeaders());
-        $this->assertEquals(8, $translations->countTranslated());
+        $this->assertEquals(10, $translations->countTranslated());
 
         $this->assertContent($translations, 'po3/Po');
         $this->assertContent($translations, 'po3/Mo');
diff --git a/tests/assets/po3/Csv.csv b/tests/assets/po3/Csv.csv
@@ -15,3 +15,5 @@ Report-Msgid-Bugs-To:
 ,"1 child","1 fillo"
 ,"1 comment","1 comentario"
 ,"1 star","1 estrela"
+,"1 world","1 Welt"
+,"1 sun","1 Sonne"
diff --git a/tests/assets/po3/CsvDictionary.csv b/tests/assets/po3/CsvDictionary.csv
@@ -6,3 +6,5 @@ Kunststoffboden,"synthetic floor"
 "1 child","1 fillo"
 "1 comment","1 comentario"
 "1 star","1 estrela"
+"1 world","1 Welt"
+"1 sun","1 Sonne"
diff --git a/tests/assets/po3/Jed.json b/tests/assets/po3/Jed.json
@@ -28,6 +28,12 @@
         ],
         "1 star": [
             "1 estrela"
+        ],
+        "1 world": [
+            "1 Welt"
+        ],
+        "1 sun": [
+            "1 Sonne"
         ]
     }
 }
diff --git a/tests/assets/po3/Json.json b/tests/assets/po3/Json.json
@@ -29,6 +29,12 @@
             ],
             "1 star": [
                 "1 estrela"
+            ],
+            "1 world": [
+                "1 Welt"
+            ],
+            "1 sun": [
+                "1 Sonne"
             ]
         }
     }
diff --git a/tests/assets/po3/JsonDictionary.json b/tests/assets/po3/JsonDictionary.json
@@ -6,5 +6,7 @@
     "Kunststoffboden": "synthetic floor",
     "1 child": "1 fillo",
     "1 comment": "1 comentario",
-    "1 star": "1 estrela"
+    "1 star": "1 estrela",
+    "1 world": "1 Welt",
+    "1 sun": "1 Sonne"
 }
diff --git a/tests/assets/po3/Mo.mo b/tests/assets/po3/Mo.mo
diff --git a/tests/assets/po3/PhpArray.php b/tests/assets/po3/PhpArray.php
@@ -49,6 +49,14 @@
       array (
         0 => '1 estrela',
       ),
+      '1 world' => 
+      array (
+        0 => '1 Welt',
+      ),
+      '1 sun' => 
+      array (
+        0 => '1 Sonne',
+      ),
     ),
   ),
 );
diff --git a/tests/assets/po3/Po.po b/tests/assets/po3/Po.po
@@ -39,3 +39,9 @@ msgid "1 star"
 msgid_plural "%s stars"
 msgstr[0] "1 estrela"
 msgstr[1] ""
+
+msgid "1 world"
+msgstr "1 Welt"
+
+msgid "1 sun"
+msgstr "1 Sonne"
diff --git a/tests/assets/po3/Xliff.xlf b/tests/assets/po3/Xliff.xlf
@@ -86,5 +86,23 @@
         <target>1 estrela</target>
       </segment>
     </unit>
+    <unit id="053956a6b44b2ec54e17b7a1b425c43b">
+      <notes>
+        <note category="context"></note>
+      </notes>
+      <segment>
+        <source>1 world</source>
+        <target>1 Welt</target>
+      </segment>
+    </unit>
+    <unit id="25b9c05aeb9c27e35a3b73f6dd5f6f2a">
+      <notes>
+        <note category="context"></note>
+      </notes>
+      <segment>
+        <source>1 sun</source>
+        <target>1 Sonne</target>
+      </segment>
+    </unit>
   </file>
 </xliff>
diff --git a/tests/assets/po3/Yaml.yml b/tests/assets/po3/Yaml.yml
@@ -12,3 +12,5 @@ messages:
     '1 child': '1 fillo'
     '1 comment': '1 comentario'
     '1 star': '1 estrela'
+    '1 world': '1 Welt'
+    '1 sun': '1 Sonne'
diff --git a/tests/assets/po3/YamlDictionary.yml b/tests/assets/po3/YamlDictionary.yml
@@ -6,3 +6,5 @@ Kunststoffboden: 'synthetic floor'
 '1 child': '1 fillo'
 '1 comment': '1 comentario'
 '1 star': '1 estrela'
+'1 world': '1 Welt'
+'1 sun': '1 Sonne'
diff --git a/tests/assets/po3/input.po b/tests/assets/po3/input.po
@@ -37,3 +37,9 @@ msgstr[1] ""
 
 msgid "1 star"
 msgstr "1 estrela"
+#
+msgid "1 world"
+msgstr "1 Welt"
+#
+msgid "1 sun"
+msgstr "1 Sonne"

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,12 @@`
`28`	`28`	`],`
`29`	`29`	`"1 star": [`
`30`	`30`	`"1 estrela"`
	`31`	`+ ],`
	`32`	`+ "1 world": [`
	`33`	`+ "1 Welt"`
	`34`	`+ ],`
	`35`	`+ "1 sun": [`
	`36`	`+ "1 Sonne"`
`31`	`37`	`]`
`32`	`38`	`}`
`33`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@`
`29`	`29`	`],`
`30`	`30`	`"1 star": [`
`31`	`31`	`"1 estrela"`
	`32`	`+ ],`
	`33`	`+ "1 world": [`
	`34`	`+ "1 Welt"`
	`35`	`+ ],`
	`36`	`+ "1 sun": [`
	`37`	`+ "1 Sonne"`
`32`	`38`	`]`
`33`	`39`	`}`
`34`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,7 @@`
`6`	`6`	`"Kunststoffboden": "synthetic floor",`
`7`	`7`	`"1 child": "1 fillo",`
`8`	`8`	`"1 comment": "1 comentario",`
`9`		`- "1 star": "1 estrela"`
	`9`	`+ "1 star": "1 estrela",`
	`10`	`+ "1 world": "1 Welt",`
	`11`	`+ "1 sun": "1 Sonne"`
`10`	`12`	`}`