fix: prevent generation of target node for updated source texts when …

…newTranslationTargetsBlank=omit/true fixes #74
daniel-sc · Sep 4, 2023 · ca0339f · ca0339f
1 parent 2dd249d
commit ca0339f
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
     "@angular-devkit/core": "^16.0.0-next.6",
     "@angular-devkit/schematics": "^16.0.0-next.6",
     "@schematics/angular": "^16.0.0-next.6",
-    "xliff-simple-merge": "~1.0.1",
+    "xliff-simple-merge": "~1.1.2",
     "xml_normalize": "^1.0.0",
     "xmldoc": "~1.1.2"
   },

diff --git a/src/builder.spec.ts b/src/builder.spec.ts
@@ -799,6 +799,47 @@ describe('Builder', () => {
             });
     });
 
+    test('extract-and-merge xlf 1.2 with newTranslationTargetsBlank=omit and trim=true', async () => {
+        await runTest(
+            {
+                messagesBefore: '<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">\n' +
+                    '  <file source-language="de" datatype="plaintext" original="ng2.template">\n' +
+                    '    <body>\n' +
+                    '      <trans-unit id="ID1" datatype="html">\n' +
+                    '        <source>source val</source>\n' +
+                    '      </trans-unit>\n' +
+                    '    </body>\n' +
+                    '  </file>\n' +
+                    '</xliff>',
+                messagesFrBefore: '<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">\n' +
+                    '  <file source-language="de" target-language="fr-ch" datatype="plaintext" original="ng2.template">\n' +
+                    '    <body>\n' +
+                    '      <trans-unit id="ID1" datatype="html">\n' +
+                    '        <source>source val </source>\n' + // note the space at the end
+                    '      </trans-unit>\n' +
+                    '    </body>\n' +
+                    '  </file>\n' +
+                    '</xliff>',
+                options: {
+                    format: 'xlf',
+                    targetFiles: ['messages.fr.xlf'],
+                    sourceLanguageTargetFile: "messages.de.xlf",
+                    outputPath: 'builder-test',
+                    removeIdsWithPrefix: ['removeMe'],
+                    newTranslationTargetsBlank: 'omit'
+                },
+                messagesFrExpected: '<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">\n' +
+                    '  <file source-language="de" target-language="fr-ch" datatype="plaintext" original="ng2.template">\n' +
+                    '    <body>\n' +
+                    '      <trans-unit id="ID1" datatype="html">\n' +
+                    '        <source>source val</source>\n' +
+                    '      </trans-unit>\n' +
+                    '    </body>\n' +
+                    '  </file>\n' +
+                    '</xliff>'
+            });
+    });
+
     test('extract-and-merge with xml definition without newline', async () => {
         await runTest(
             {