Add multiple comments to test suite

Remove odd choice where extracted comments where added to translator comments
lingui · Nov 11, 2020 · 83b9e3d · 83b9e3d
1 parent d060297
commit 83b9e3d
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 19 deletions.
diff --git a/packages/cli/src/api/__snapshots__/catalog.test.ts.snap b/packages/cli/src/api/__snapshots__/catalog.test.ts.snap
@@ -21,8 +21,15 @@ Object {
     ],
   },
   Hello World: Object {
-    extractedComments: Array [],
+    extractedComments: Array [
+      Comment A,
+      Hello comment,
+    ],
     origin: Array [
+      Array [
+        collect/componentA/componentA.js,
+        2,
+      ],
       Array [
         collect/componentA/index.js,
         1,
@@ -59,10 +66,17 @@ Object {
     },
     Hello World: Object {
       comments: Array [],
-      extractedComments: Array [],
+      extractedComments: Array [
+        Comment A,
+        Hello comment,
+      ],
       flags: Array [],
       obsolete: false,
       origin: Array [
+        Array [
+          collect/componentA/componentA.js,
+          2,
+        ],
         Array [
           collect/componentA/index.js,
           1,
@@ -87,10 +101,17 @@ Object {
     },
     Hello World: Object {
       comments: Array [],
-      extractedComments: Array [],
+      extractedComments: Array [
+        Comment A,
+        Hello comment,
+      ],
       flags: Array [],
       obsolete: false,
       origin: Array [
+        Array [
+          collect/componentA/componentA.js,
+          2,
+        ],
         Array [
           collect/componentA/index.js,
           1,
@@ -158,10 +179,17 @@ Object {
     },
     Hello World: Object {
       comments: Array [],
-      extractedComments: Array [],
+      extractedComments: Array [
+        Comment A,
+        Hello comment,
+      ],
       flags: Array [],
       obsolete: false,
       origin: Array [
+        Array [
+          collect/componentA/componentA.js,
+          2,
+        ],
         Array [
           collect/componentA/index.js,
           1,
@@ -199,10 +227,17 @@ Object {
     },
     Hello World: Object {
       comments: Array [],
-      extractedComments: Array [],
+      extractedComments: Array [
+        Comment A,
+        Hello comment,
+      ],
       flags: Array [],
       obsolete: false,
       origin: Array [
+        Array [
+          collect/componentA/componentA.js,
+          2,
+        ],
         Array [
           collect/componentA/index.js,
           1,
@@ -240,10 +275,17 @@ Object {
     },
     Hello World: Object {
       comments: Array [],
-      extractedComments: Array [],
+      extractedComments: Array [
+        Comment A,
+        Hello comment,
+      ],
       flags: Array [],
       obsolete: false,
       origin: Array [
+        Array [
+          collect/componentA/componentA.js,
+          2,
+        ],
         Array [
           collect/componentA/index.js,
           1,
@@ -274,10 +316,17 @@ Object {
   },
   Hello World: Object {
     comments: Array [],
-    extractedComments: Array [],
+    extractedComments: Array [
+      Comment A,
+      Hello comment,
+    ],
     flags: Array [],
     obsolete: false,
     origin: Array [
+      Array [
+        collect/componentA/componentA.js,
+        2,
+      ],
       Array [
         collect/componentA/index.js,
         1,

diff --git a/packages/cli/src/api/fixtures/collect/componentA/componentA.js b/packages/cli/src/api/fixtures/collect/componentA/componentA.js
@@ -1 +1,2 @@
-/*i18n*/ i18n._("Component A")
+/*i18n*/ i18n._("Component A");
+/*i18n*/ i18n._("Hello World", {}, {comment: "Comment A"});
diff --git a/packages/cli/src/api/fixtures/collect/componentA/index.js b/packages/cli/src/api/fixtures/collect/componentA/index.js
@@ -1 +1 @@
-/*i18n*/ i18n._("Hello World")
+/*i18n*/ i18n._("Hello World", {}, {comment: "Hello comment"})
diff --git a/packages/cli/src/api/formats/__snapshots__/po.test.ts.snap b/packages/cli/src/api/formats/__snapshots__/po.test.ts.snap
@@ -5,7 +5,6 @@ Object {
   withDescriptionAndComments: Object {
     comments: Array [
       Translator comment,
-      Second description?,
     ],
     extractedComments: Array [
       Single description only,
@@ -17,10 +16,7 @@ Object {
     translation: Second description joins translator comments,
   },
   withMultipleDescriptions: Object {
-    comments: Array [
-      Second comment,
-      Third comment,
-    ],
+    comments: Array [],
     extractedComments: Array [
       First description,
       Second comment,

diff --git a/packages/cli/src/api/formats/po.ts b/packages/cli/src/api/formats/po.ts
@@ -54,11 +54,7 @@ const deserialize: (item: Object) => Object = R.map(
   R.applySpec({
     translation: R.compose(R.head, R.defaultTo([]), getTranslations),
     extractedComments: R.compose(R.defaultTo([]), getExtractedComments),
-    comments: (item) =>
-      R.concat(
-        getTranslatorComments(item) as string,
-        R.tail(getExtractedComments(item))
-      ),
+    comments: R.compose(R.defaultTo([]), getTranslatorComments),
     obsolete: isObsolete,
     origin: R.compose(R.map(splitOrigin), R.defaultTo([]), getOrigins),
     flags: getFlags,
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/i18n/ i18n._("Hello World")
		/i18n/ i18n._("Hello World", {}, {comment: "Hello comment"})