fix: output multiple origins on separate lines (#290)

lingui · Aug 26, 2018 · c587586 · c587586
1 parent c254d91
commit c587586
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/packages/cli/src/api/formats/__snapshots__/po.test.js.snap b/packages/cli/src/api/formats/__snapshots__/po.test.js.snap
@@ -26,7 +26,7 @@ Object {
     origin: undefined,
     translation: Message with description,
   },
-  withOrigin: Object {
+  withMultipleOrigins: Object {
     description: undefined,
     obsolete: false,
     origin: Array [
@@ -39,6 +39,17 @@ Object {
         2,
       ],
     ],
+    translation: Message with multiple origin,
+  },
+  withOrigin: Object {
+    description: undefined,
+    obsolete: false,
+    origin: Array [
+      Array [
+        src/App.js,
+        4,
+      ],
+    ],
     translation: Message with origin,
   },
 }
@@ -61,7 +72,8 @@ msgstr ""
 msgid "static"
 msgstr "Static message"
 
-#: src/App.js:4, src/Component.js:2
+#: src/App.js:4
+#: src/Component.js:2
 msgid "withOrigin"
 msgstr "Message with origin"
 

diff --git a/packages/cli/src/api/formats/fixtures/messages.po b/packages/cli/src/api/formats/fixtures/messages.po
@@ -14,10 +14,15 @@ msgstr ""
 msgid "static"
 msgstr "Static message"
 
-#: src/App.js:4, src/Component.js:2
+#: src/App.js:4
 msgid "withOrigin"
 msgstr "Message with origin"
 
+#: src/App.js:4
+#: src/Component.js:2
+msgid "withMultipleOrigins"
+msgstr "Message with multiple origin"
+
 #. Description is comment from developers to translators
 msgid "withDescription"
 msgstr "Message with description"

diff --git a/packages/cli/src/api/formats/po.js b/packages/cli/src/api/formats/po.js
@@ -48,7 +48,10 @@ const serialize = R.compose(
     return [
       "",
       message.description && `#. ${message.description}`,
-      message.origin && `#: ${prettyOrigin(message.origin)}`,
+      ...(message.origin
+        ? // print one origin per line (don't join multiple origins with comma)
+          message.origin.map(origin => `#: ${prettyOrigin([origin])}`)
+        : []),
       message.obsolete && `#, obsolete`,
       `msgid "${escape(key)}"`,
       `msgstr "${escape(translation)}"`
@@ -61,7 +64,8 @@ const serialize = R.compose(
 function parseOrigin(origins) {
   if (!origins) return
 
-  return origins.split(", ").map(origin => origin.split(":"))
+  // split by comma or newlines, but don't remember matched delimiter
+  return origins.split(/(?:, |\n)/).map(origin => origin.split(":"))
 }
 
 const deserialize = R.map(message => ({