Merge pull request #89 from martinroob/bugfix-0.16.1

Bugfix 0.16.1
martinroob · May 25, 2018 · ba20a72 · ba20a72
2 parents 2b342e0 + 032446c
commit ba20a72
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,11 @@
+<a name="0.16.1"></a>
+# [0.16.1](https://github.com/martinroob/ngx-i18nsupport/compare/v0.16.1...v0.16.0) (2018-05-25)
+
+### Bug fixes
+* **xliffmerge:** New configuration flag `beautifyOutput` now working. When set to `true`  now [pretty-data](https://github.com/vkiryukhin/pretty-data) (the library beyond pretty-xml) will be used to format the output.
+([#64](https://github.com/martinroob/ngx-i18nsupport/issues/64))
+([#88](https://github.com/martinroob/ngx-i18nsupport/issues/88))
+
 <a name="0.16.0"></a>
 # [0.16.0](https://github.com/martinroob/ngx-i18nsupport/compare/v0.16.0...v0.15.0) (2018-05-01)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-i18nsupport",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Some tooling to be used with the Angular 2 i18n workflow",
   "main": "index.js",
   "module": "./src",

diff --git a/src/xliffmerge/translation-messages-file-reader.ts b/src/xliffmerge/translation-messages-file-reader.ts
@@ -69,7 +69,7 @@ export class TranslationMessagesFileReader {
      * Default is false.
      */
     public static save(messagesFile: ITranslationMessagesFile, beautifyOutput?: boolean) {
-        FileUtil.replaceContent(messagesFile.filename(), messagesFile.editedContent(), messagesFile.encoding());
+        FileUtil.replaceContent(messagesFile.filename(), messagesFile.editedContent(beautifyOutput), messagesFile.encoding());
     }
 }
 
diff --git a/src/xliffmerge/xlf12-merge.spec.ts b/src/xliffmerge/xlf12-merge.spec.ts
@@ -616,6 +616,48 @@ describe('XliffMerge XLIFF 1.2 format tests', () => {
             done();
         });
 
+        it('should use beautify when requested (#64, #88)', (done) => {
+            FileUtil.copy(MASTER1SRC, MASTER);
+            let ws: WriterToString = new WriterToString();
+            let commandOut = new CommandOutput(ws);
+            let profileContent: IConfigFile = {
+                xliffmergeOptions: {
+                    defaultLanguage: 'de',
+                    srcDir: WORKDIR,
+                    genDir: WORKDIR,
+                    i18nFile: MASTERFILE
+                }
+            };
+            let xliffMergeCmd = XliffMerge.createFromOptions(commandOut, {languages: ['de', 'en']}, profileContent);
+            xliffMergeCmd.run();
+            expect(ws.writtenData()).not.toContain('ERROR');
+
+            const unformattedContent = XmlReader.readXmlFileContent(xliffMergeCmd.generatedI18nFile('en'));
+            expect(unformattedContent.content).toContain('<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">');
+// to debug formatting:                        FileUtil.copy(xliffMergeCmd.generatedI18nFile('en'), SRCDIR + 'nobeautify');
+
+            // next step, same with beautify
+            FileUtil.deleteFile(xliffMergeCmd.generatedI18nFile('en'));
+            ws = new WriterToString();
+            commandOut = new CommandOutput(ws);
+            profileContent = {
+                xliffmergeOptions: {
+                    defaultLanguage: 'de',
+                    srcDir: WORKDIR,
+                    genDir: WORKDIR,
+                    i18nFile: MASTERFILE,
+                    beautifyOutput: true
+                }
+            };
+            xliffMergeCmd = XliffMerge.createFromOptions(commandOut, {languages: ['de', 'en']}, profileContent);
+            xliffMergeCmd.run();
+            expect(ws.writtenData()).not.toContain('ERROR');
+            const formattedContent = XmlReader.readXmlFileContent(xliffMergeCmd.generatedI18nFile('en'));
+            expect(formattedContent.content).toContain('<xliff version="1.2" \n  xmlns="urn:oasis:names:tc:xliff:document:1.2">');
+// to debug formatting:            FileUtil.copy(xliffMergeCmd.generatedI18nFile('en'), SRCDIR + 'beautify');
+            done();
+        });
+
         describe('autotranslate via google translate', () => {
 
             let apikey: string;