fix: set translation to default only in minimal format

lingui · Jun 24, 2018 · f33ad9c · f33ad9c
1 parent f95f838
commit f33ad9c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/cli/src/api/formats/lingui.js b/packages/cli/src/api/formats/lingui.js
@@ -62,7 +62,7 @@ export default (config: LinguiConfig): CatalogFormat => ({
         const newMessages = R.mapObjIndexed(
           (message, key) => ({
             translation:
-              message.defaults || (config.sourceLocale === locale ? key : ""),
+              config.sourceLocale === locale && !message.defaults ? key : "",
             ...message
           }),
           R.pick(newKeys, nextCatalog)

diff --git a/packages/cli/src/api/formats/minimal.js b/packages/cli/src/api/formats/minimal.js
@@ -16,7 +16,10 @@ function deserialize(catalog) {
 }
 
 function serialize(catalog) {
-  return R.map(message => message.translation || "", catalog)
+  return R.map(
+    message => message.translation || message.defaults || "",
+    catalog
+  )
 }
 
 export default (config: LinguiConfig): CatalogFormat => {