@automattic/babel-plugin-i18n-calypso - npm Package Compare versions

Comparing version 1.1.1 to 1.2.0

package.json

 {
 	"name": "@automattic/babel-plugin-i18n-calypso",
-	"version": "1.1.1",
+	"version": "1.2.0",
 	"description": "A Babel plugin to generate a POT file for translate calls",
@@ -24,3 +24,3 @@ "main": "src/index.js",
 	"license": "GPL-2.0-or-later",
-	"gitHead": "d2e6d7e0b02619f09de68f11bb24f86f8aca8b76"
+	"gitHead": "aaa8f0cf8a2a8a1b61d2a57506c465d0743b6a72"
 }

src/index.js

@@ -192,2 +192,31 @@ /**
 
+/**
+ * Merge the properties of extracted string objects.
+ *
+ * @param   {object} source left-hand string object
+ * @param   {object} target right-hand string object
+ *
+ * @returns {void}
+ */
+function mergeStrings( source, target ) {
+	if ( ! source.comments.reference.includes( target.comments.reference ) ) {
+		source.comments.reference += '\n' + target.comments.reference;
+	}
+
+	if ( ! source.comments.extracted ) {
+		source.comments.extracted = target.comments.extracted;
+	} else if (
+		target.comments.extracted &&
+		! source.comments.extracted.includes( target.comments.extracted )
+	) {
+		source.comments.extracted += '\n' + target.comments.extracted;
+	}
+
+	// A previous singular string matches a plural string. In PO files those are merged.
+	if ( ! source.hasOwnProperty( 'msgid_plural' ) && target.hasOwnProperty( 'msgid_plural' ) ) {
+		source.msgid_plural = target.msgid_plural;
+		source.msgstr = target.msgstr;
+	}
+}
+
 module.exports = function () {
@@ -321,8 +350,4 @@ let strings = {},
 					strings[ msgctxt ][ msgid ] = translation;
-				} else if (
-					! strings[ msgctxt ][ msgid ].comments.reference.includes(
-						translation.comments.reference
-					)
-				) {
-					strings[ msgctxt ][ msgid ].comments.reference += '\n' + translation.comments.reference;
+				} else {
+					mergeStrings( strings[ msgctxt ][ msgid ], translation );
 				}
@@ -329,0 +354,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

40744

increased by1.94%

Lines of code

730

increased by3.11%

No dependency changes