Fix multiline strings in PO #244

Author: Oscar Otero

CHANGELOG.md

@@ -2,11 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 Previous releases are documented in [github releases](https://github.com/oscarotero/Gettext/releases)
 
+## [5.2.1] - 2019-12-08
+### Fixed
+- Multiline string in PoGenerator [#244]
+
 ## [5.2.0] - 2019-11-25
 ### Added
 - New function `CodeScanner::extractCommentsStartingWith()` to extract comments from the code.
@@ -41,5 +45,8 @@ Previous releases are documented in [github releases](https://github.com/oscarot
 - The library is easier to extend
 - Translation id can be independent of the context + original values, in order to be more compatible with Xliff format.
 
-[5.2.0]: https://github.com/php-gettext/Gettext/compare/v5.1.0...HEAD
+[#244]: https://github.com/php-gettext/Gettext/issues/244
+
+[5.2.1]: https://github.com/php-gettext/Gettext/compare/v5.2.0...v5.2.1
+[5.2.0]: https://github.com/php-gettext/Gettext/compare/v5.1.0...v5.2.0
 [5.1.0]: https://github.com/php-gettext/Gettext/compare/v5.0.0...v5.1.0

src/Generator/PoGenerator.php

@@ -87,8 +87,9 @@ private static function appendLines(array &$lines, string $prefix, string $name,
 
         $lines[] = sprintf('%s%s ""', $prefix, $name);
 
+        $last = $total - 1;
         foreach ($newLines as $k => $line) {
-            if ($k === $total - 1) {
+            if ($k < $last) {
                 $line .= "\n";
             }
 

tests/PoGeneratorTest.php

@@ -37,6 +37,11 @@ public function testPoLoader()
         $translation->getComments()->add('This is a disabled comment');
         $translations->add($translation);
 
+        // https://github.com/php-gettext/Gettext/issues/244
+        $translation = Translation::create(null, "foo\nbar");
+        $translation->translate("bar\nbaz");
+        $translations->add($translation);
+
         $result = $generator->generateString($translations);
 
         $expected = <<<'EOT'
@@ -64,6 +69,13 @@ public function testPoLoader()
 #~ msgid "Disabled comment"
 #~ msgstr "Comentario deshabilitado"
 
+msgid ""
+"foo\n"
+"bar"
+msgstr ""
+"bar\n"
+"baz"
+
 EOT;
 
         $this->assertSame($expected, $result);