fix: po-gettext format issues with CLI (#1073)

lingui · Jun 4, 2021 · a529aca · a529aca · vercel · Jun 4, 2021
1 parent 9990eba
commit a529aca
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/cli/src/api/formats/index.ts b/packages/cli/src/api/formats/index.ts
@@ -17,6 +17,7 @@ const formats: Record<CatalogFormat, CatalogFormatter> = {
 
 type CatalogFormatOptionsInternal = {
   locale: string
+  disableSelectWarning?: boolean
 } & CatalogFormatOptions
 
 export type CatalogFormatter = {

diff --git a/packages/cli/src/api/formats/po-gettext.ts b/packages/cli/src/api/formats/po-gettext.ts
@@ -62,9 +62,13 @@ const serialize = (items: CatalogType, options) =>
       // The extractedComments array may be modified in this method, so create a new array with the message's elements.
       // Destructuring `undefined` is forbidden, so fallback to `[]` if the message has no extracted comments.
       item.extractedComments = [...(message.extractedComments ?? [])]
-
-      if (options.origins) {
-        item.references = message.origin ? message.origin.map(joinOrigin) : []
+
+      if (options.origins !== false) {
+        if (message.origin && options.lineNumbers === false) {
+          item.references = message.origin.map(msg => msg.slice(0, -1)).map(joinOrigin)
+        } else {
+          item.references = message.origin ? message.origin.map(joinOrigin) : []
+        }
       }
 
       // @ts-ignore: Figure out how to set this flag