Multi-language fixes.

Ylianst · Nov 15, 2020 · 43c4961 · 43c4961
1 parent f4d0aa8
commit 43c4961
Show file tree

Hide file tree

Showing 16 changed files with 165,275 additions and 2,866 deletions.
diff --git a/index.html b/index.html
@@ -917,11 +917,11 @@ <h1>WSMAN Browser</h1>
                     <h1>Serial-over-LAN Terminal</h1>
                     <br>
                     <div id="id_p13warning1" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick="showFeaturesDlg()">
-                        <div class="icon2" style="float:left;margin:7px" /><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Intel&reg; AMT Redirection port or Serial-over-LAN feature is disabled<span id="id_p13warninga">, click here to enable it.</span></div>
+                        <div class="icon2" style="float:left;margin:7px"></div><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Intel&reg; AMT Redirection port or Serial-over-LAN feature is disabled<span id="id_p13warninga">, click here to enable it.</span></div>
                     </div>
                     <!-- ###BEGIN###{PowerControl} -->
                     <div id="id_p13warning2" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick="showPowerActionDlg()">
-                        <div class="icon2" style="float:left;margin:7px" /><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Remote computer is not powered on, click here to issue a power command.</div>
+                        <div class="icon2" style="float:left;margin:7px"></div><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Remote computer is not powered on, click here to issue a power command.</div>
                     </div>
                     <!-- ###END###{PowerControl} -->
                     <table cellpadding="0" cellspacing="0" style="width:100%;padding:0px;padding:0px;margin-top:0px">
@@ -989,11 +989,11 @@ <h1>Serial-over-LAN Terminal</h1>
                 <div id="p14" style="display:none;min-width:780px">
                     <div id="id_rdheader"><h1>Remote Desktop</h1><br></div>
                     <div id="id_p14warning1" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick="showFeaturesDlg()">
-                        <div class="icon2" style="float:left;margin:7px" /><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Intel&reg; AMT Redirection port or KVM feature is disabled<span id="id_p14warninga">, click here to enable it.</span></div>
+                        <div class="icon2" style="float:left;margin:7px"></div><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Intel&reg; AMT Redirection port or KVM feature is disabled<span id="id_p14warninga">, click here to enable it.</span></div>
                     </div>
                     <!-- ###BEGIN###{PowerControl} -->
                     <div id="id_p14warning2" style='max-width:100%;display:none;cursor:pointer;margin-bottom:5px' onclick="showPowerActionDlg()">
-                        <div class="icon2" style="float:left;margin:7px" /><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Remote computer is not powered on, click here to issue a power command.</div>
+                        <div class="icon2" style="float:left;margin:7px"></div><div style='width:auto;border-radius:8px;padding:8px;background-color:lightsalmon'>Remote computer is not powered on, click here to issue a power command.</div>
                     </div>
                     <!-- ###END###{PowerControl} -->
                     <table cellpadding="0" cellspacing="0" style="width: 100%; padding: 0px; padding: 0px; margin-top: 0px">

diff --git a/index_de.html b/index_de.html
diff --git a/index_es.html b/index_es.html
diff --git a/index_fr.html b/index_fr.html
diff --git a/index_it.html b/index_it.html
diff --git a/index_ja.html b/index_ja.html
diff --git a/index_ko.html b/index_ko.html
diff --git a/index_nl.html b/index_nl.html
diff --git a/index_pt.html b/index_pt.html
diff --git a/index_ru.html b/index_ru.html
diff --git a/index_zh-chs.html b/index_zh-chs.html
diff --git a/package.json b/package.json
@@ -1,18 +1,30 @@
 {
-    "name": "MeshCommander",
-    "version": "0.8.8",
-    "description": "Intel(R) Active Management Technology console tool",
-    "main": "index-nw.html",
-    "author": "Intel Corporation",
-    "keywords": [ "Intel", "Intel AMT", "Active Management Technology", "Remote Management", "Hardware Management", "Manageability Commander" ],
-    "single-instance":  false,
-    "window": {
-        "icon": "favicon.png",
-        "toolbar": false,
-        "frame": true,
-        "width": 970,
-        "min_width": 970,
-        "height": 760,
-        "min_height": 640
-    }
-}
+  "name": "MeshCommander",
+  "version": "0.8.8",
+  "description": "Intel(R) Active Management Technology console tool",
+  "main": "index-nw.html",
+  "author": "Intel Corporation",
+  "keywords": [
+    "Intel",
+    "Intel AMT",
+    "Active Management Technology",
+    "Remote Management",
+    "Hardware Management",
+    "Manageability Commander"
+  ],
+  "single-instance": false,
+  "window": {
+    "icon": "favicon.png",
+    "toolbar": false,
+    "frame": true,
+    "width": 970,
+    "min_width": 970,
+    "height": 760,
+    "min_height": 640
+  },
+  "dependencies": {
+    "html-minifier": "^4.0.0",
+    "jsdom": "^16.4.0",
+    "minify-js": "0.0.4"
+  }
+}
diff --git a/translate/translate.bat b/translate/translate.bat
@@ -1,4 +1,4 @@
 @ECHO OFF
-%LOCALAPPDATA%\..\Roaming\nvm\v12.13.0\node translate.js minifyall
+REM %LOCALAPPDATA%\..\Roaming\nvm\v12.13.0\node translate.js minifyall
 %LOCALAPPDATA%\..\Roaming\nvm\v12.13.0\node translate.js translateall
 %LOCALAPPDATA%\..\Roaming\nvm\v12.13.0\node translate.js extractall
diff --git a/translate/translate.js b/translate/translate.js
@@ -17,11 +17,11 @@ var minifyLib = 2; // 0 = None, 1 = minify-js, 2 = HTMLMinifier
 var minify = null;
 
 var meshCentralSourceFiles = [
-    "../commander.htm"
+    "../index.html"
 ];
 
 var minifyMeshCentralSourceFiles = [
-    "../commander.htm"
+    "../index.html"
 ];
 
 // True is this module is run directly using NodeJS
@@ -697,6 +697,7 @@ function translateFromHtml(lang, file, createSubDir) {
     }
     fs.writeFileSync(outname, out, { flag: 'w+' });
 
+    /*
     // Minify the file
     if (minifyLib == 1) {
         minify.file({
@@ -731,6 +732,7 @@ function translateFromHtml(lang, file, createSubDir) {
         if (outnamemin.endsWith('.handlebars') >= 0) { minifiedOut = minifiedOut.split('"{{{pluginHandler}}}"').join('{{{pluginHandler}}}'); }
         fs.writeFileSync(outnamemin, minifiedOut, { flag: 'w+' });
     }
+    */
 }
 
 function minifyDone() { log('Completed minification.'); }