Merge pull request #84 from rvanbekkum/develop

Release 1.1.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.1.0] 26-02-2021
+
+* Fixed new unit nodes getting `state="translated"` with no translation. Bug due to changes for GitHub issue [#67](https://github.com/rvanbekkum/vsc-xliff-sync/issues/67). (GitHub issue [#81](https://github.com/rvanbekkum/vsc-xliff-sync/issues/81))
+
 ## [1.0.0] 21-02-2021
 
 * Optimized syncing through a preprocessing step that builds up unit maps. The existing implementation approaches O(n^2) while this optimization implemented brings it down to O(n) (with n being the number of translation units). This optimization was already applied earlier in the PowerShell version (see [ps-xliff-sync](https://github.com/rvanbekkum/ps-xliff-sync)). The new setting `xliffSync.unitMaps` can be used to change whether and to which extent these maps should be used (**Default**: `"All"`). (GitHub issue [#31](https://github.com/rvanbekkum/vsc-xliff-sync/issues/31))

README.md

@@ -11,6 +11,8 @@ This extension is based on the [Angular Localization Helper](https://github.com/
 It is specifically targeted at synchronizing trans-units from an `<ApplicationName>.g.xlf` file automatically generated by the [AL Language](https://marketplace.visualstudio.com/items?itemName=ms-dynamics-smb.al) extension that can be used to develop extensions for Microsoft Dynamics 365 Business Central.
 Apart from synchronizing trans-units from a base-XLIFF file, this extension contributes various other features, including commands to check for missing translations, detect problems in translations and import translations from external XLIFF files.
 
+More information: [XLIFF Sync: Time for a complete overview](https://robvanbekkum.nl/xliff-sync-overview/)
+
 * [Features](#features)
 * [Contributions](#contributions)
   * [Commands](#commands)

package.json

@@ -2,7 +2,7 @@
     "name": "xliff-sync",
     "displayName": "XLIFF Sync",
     "description": "A tool to keep XLIFF translation files in sync.",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "publisher": "rvanbekkum",
     "repository": {
         "type": "git",

src/features/tools/xlf-translator.ts

@@ -123,7 +123,7 @@ export class XlfTranslator {
             }
           }
 
-          if (!translChildNodes && findBySource) {
+          if ((!translChildNodes || (translChildNodes.length === 1 && translChildNodes[0] === missingTranslationKeyword)) && findBySource) {
             if (!(source in sourceTranslations)) {
               let transUnitTrl = targetDocument.findFirstTranslationUnitBySource(source);
               if (transUnitTrl) {
@@ -140,7 +140,7 @@ export class XlfTranslator {
         }
       }
 
-      if (!translChildNodes && (copyFromSource || parseFromDeveloperNote)) {
+      if ((!translChildNodes || (translChildNodes.length === 1 && translChildNodes[0] === missingTranslationKeyword)) && (copyFromSource || parseFromDeveloperNote)) {
         let hasNoTranslation: boolean = false;
         if (targetUnit) {
           const translationText: string | undefined = targetDocument.getUnitTranslationText(targetUnit);
@@ -158,13 +158,13 @@ export class XlfTranslator {
         const shouldParseFromDevNote: boolean = parseFromDeveloperNote && (hasNoTranslation || parseFromDeveloperNoteOverwrite);
         const shouldCopyFromSource: boolean = copyFromSource && (hasNoTranslation || copyFromSourceOverwrite);
 
-        if (!translChildNodes && shouldParseFromDevNote) {
+        if ((!translChildNodes || (translChildNodes.length === 1 && translChildNodes[0] === missingTranslationKeyword)) && shouldParseFromDevNote) {
           const translationFromDeveloperNote: string | undefined = mergedDocument.getUnitTranslationFromDeveloperNote(unit);
           if (translationFromDeveloperNote) {
             translChildNodes = [translationFromDeveloperNote];
           }
         }
-        if (!translChildNodes && shouldCopyFromSource) {
+        if ((!translChildNodes || (translChildNodes.length === 1 && translChildNodes[0] === missingTranslationKeyword)) && shouldCopyFromSource) {
           translChildNodes = targetDocument.getUnitSourceChildren(unit);
         }
       }

src/features/tools/xlf/xlf-document.ts

@@ -671,7 +671,7 @@ export class XlfDocument {
     if (needsTranslation && !targetNode) {
       let attributes: { [key: string]: string; } = {};
       let newTranslationState: translationState = translationState.translated;
-      if (!translChildNodes) {
+      if (!translChildNodes || (translChildNodes.length === 1 && translChildNodes[0] === this.missingTranslation)) {
         translChildNodes = [this.missingTranslation];
         newTranslationState = translationState.missingTranslation;
       }
@@ -687,7 +687,7 @@ export class XlfDocument {
     }
 
     if (needsTranslation && targetNode) {
-      if (translChildNodes) {
+      if (translChildNodes && !(translChildNodes.length === 1 && translChildNodes[0] === this.missingTranslation)) {
         targetNode.children = translChildNodes;
         if (!targetNode.attributes) {
           targetNode.attributes = {};

src/features/trans-import.ts

@@ -21,7 +21,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import { ExtensionContext, window, commands, OpenDialogOptions, Uri, workspace, env, WorkspaceFolder } from "vscode";
+import { ExtensionContext, window, commands, OpenDialogOptions, Uri, workspace, env, WorkspaceFolder, WorkspaceConfiguration } from "vscode";
 import { XlfDocument } from './tools/xlf/xlf-document';
 import { FilesHelper, WorkspaceHelper, XmlNode } from './tools';
 
@@ -88,15 +88,17 @@ async function importTranslationsFromFile(workspaceFolder: WorkspaceFolder, file
         window.showErrorMessage('The provided file URI is invalid!');
         return;
     }
-    const replaceTranslationsDuringImport: boolean = workspace.getConfiguration('xliffSync', workspaceFolder.uri)['replaceTranslationsDuringImport'];
+    const xliffWorkspaceConfiguration: WorkspaceConfiguration = workspace.getConfiguration('xliffSync', workspaceFolder.uri);
+    const missingTranslationKeyword: string = xliffWorkspaceConfiguration['missingTranslation'];
+    const replaceTranslationsDuringImport: boolean = xliffWorkspaceConfiguration['replaceTranslationsDuringImport'];
 
     const selFileDocument = await XlfDocument.loadFromUri(fileUri, workspaceFolder.uri);
     let sourceDevNoteTranslations: { [key: string]: (XmlNode | string)[]; } = {};
     selFileDocument.translationUnitNodes.forEach((unit) => {
         const sourceDevNoteText = getSourceDevNoteText(selFileDocument, unit);
         if (sourceDevNoteText && !(sourceDevNoteText in sourceDevNoteTranslations)) {
             const translChildNodes = selFileDocument.getUnitTranslationChildren(unit);
-            if (translChildNodes) {
+            if (translChildNodes && !(translChildNodes.length === 1 && translChildNodes[0] === missingTranslationKeyword)) {
                 sourceDevNoteTranslations[sourceDevNoteText] = translChildNodes;
             }
         }