From f33ad9c20ea67e431e8b60d497bb2100a462fda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ehrlich?= Date: Sun, 24 Jun 2018 07:14:08 +0200 Subject: [PATCH] fix: set translation to default only in minimal format --- packages/cli/src/api/formats/lingui.js | 2 +- packages/cli/src/api/formats/minimal.js | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/api/formats/lingui.js b/packages/cli/src/api/formats/lingui.js index 308470476..c851c9a1b 100644 --- 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 index 033578ef2..1add092c6 100644 --- 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 => {