From 4c8ef11e9b3d220cad56cb027339c27c272e7c1e Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 19 Nov 2021 13:22:28 +0100
Subject: [PATCH] Resolve charset .idtx/.idt confusion

NMake inline files are always created using ACP. The "1252" in the .idtx
header has no effect on this. However, we must encode the .idt files
using correct charset/codepage regardless the ACP being used on the
building machine.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 Core/Makefile | Bin 161268 -> 159916 bytes
 IDT.js        |   6 +++---
 MSI.wsf       |  23 ++++++++++++-----------
 String.js     |  35 ++++++++++++++++++++---------------
 UI/Makefile   | Bin 104782 -> 102426 bytes
 5 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/Core/Makefile b/Core/Makefile
index 51a4d6fe0b9aeaf135360342438158462207ef03..4c71572e7f990dea379df1226770c85187691a20 100644
GIT binary patch
delta 320
zcmezJnsd!V&J7J5lV#YICfkV#Oy=OQ0MkAkIn&$JnfNAO5awf4oP1wceDV!W5oUh|
z+vy*rnY1T!u!~G?;1HTFkj$jC`2)u#uE__4_@)&z>P=oCC^CJW6_efM1`#nvg~=Z|
zB!Rj#CodG;+?*n|Jw=RhhT7yWiei)d6nM64*fLI1f$5yCmdw~T`4fi(O#O7RT*f)u
z4N@6h<fcEVVf5O5qM1>F1*Cj>KsBSs^t=wnB2*h7I`X<1r!h`e$`jkJ(#y!w3)UbY
t$7C@5OgEz#*lp7rq?yE~Ni(rv(_SXa)FTadRGuZ%3~Z_v*f51y0sx9dXg~k}

delta 490
zcmZ4Ukn_uH&J7J5lRt0@O?Kc^n{33Ju{nfm5!d82P8nfa23rON1|^16hCGINhERrJ
z2BqnZ4UD#vbwq@w*O@Xo02yM_w-qoNO}}Qy#5ehy$g;_sIJKrbNieOOe2iUe@(FgK
z>0Zf<Gn%Euw@ZmLzEI^fWH4ed1!B(ajJAwhRq$Ff{fsrE0@xl9O9f%k^lgcZhmdU&
z*$%YjjvT`D$?GH4xBE0Py0GB0A#wVLHpUDjbJNNg?WP}SU{nH0WTDsq_Q&=k9gNc$
z5!P&v>|&Je#b<@>^bO)n1qdsEVPpdmD#BuTk0eu%G=9SZjG1(%H<&WzpqU60&%<JD
JggH})B>>FNk+J{)

diff --git a/IDT.js b/IDT.js
index d4851a2..65f82bc 100644
--- a/IDT.js
+++ b/IDT.js
@@ -93,7 +93,7 @@ function IDT(path)
 		// Parse meta info
 		var line = parseRow(dat.ReadText(adReadLine).split("\t")), i = 0;
 		this.codepage = parseInt(line[i], 10);
-		if (isNaN(this.codepage)) this.codepage = 1252; else i++;
+		if (isNaN(this.codepage)) this.codepage = 0; else i++;
 		this.table = line[i++];
 		this.key = line.slice(i);
 		for (var i in this.key) {
@@ -315,8 +315,8 @@ IDT.prototype.save = function(path)
 		dat.WriteText(buildRow(this.columns).join("\t"), adWriteLine);
 		dat.WriteText(buildRow(this.types  ).join("\t"), adWriteLine);
 		var meta = new Array();
-		if (WScript.Arguments.Named.Exists("CP"))
-			meta.push(WScript.Arguments.Named("CP"));
+		if ("codepage" in this)
+			meta.push(this.codepage.toString(10));
 		meta.push(this.table);
 		for (var key in this.key)
 			meta.push(this.columns[this.key[key]]);
diff --git a/MSI.wsf b/MSI.wsf
index 5344f8c..4c2c8ac 100644
--- a/MSI.wsf
+++ b/MSI.wsf
@@ -568,7 +568,7 @@
 			<description>Translate IDT file.</description>
 			<unnamed name="&lt;destination.idt&gt;" helpstring="Translated IDT file" required="true"/>
 			<unnamed name="&lt;source.idt&gt;" helpstring="Original IDT file" required="true"/>
-			<unnamed name="&lt;catalogue.po&gt;" helpstring="PO catalog file with translations" required="true"/>
+			<unnamed name="&lt;catalogue.po&gt;" helpstring="PO catalog file with translations" required="false"/>
 			<named name="CP" helpstring="Output code page" type="string" required="false"/>
 		</runtime>
 		<reference object="ADODB.Stream"/>
@@ -577,7 +577,7 @@
 		<script language="JScript" src="PO.js"/>
 		<script language="JScript" src="String.js"/>
 		<script language="JScript"><![CDATA[
-			if (WScript.Arguments.Unnamed.Length < 3) {
+			if (WScript.Arguments.Unnamed.Length < 2) {
 				WScript.Arguments.ShowUsage();
 				WScript.Quit(1);
 			}
@@ -587,16 +587,17 @@
 				idt_dst_path = WScript.Arguments.Unnamed(0);
 
 			try {
-				// Open and parse source IDT file and PO catalogue.
-				var
-					idt_src = new IDT(WScript.Arguments.Unnamed(1)),
-					po      = new POCatalog(WScript.Arguments.Unnamed(2));
+				// Open and parse source IDT file.
+				var idt_src = new IDT(WScript.Arguments.Unnamed(1));
 
-				// Translate records.
-				for (var key in idt_src.data) {
-					for (var col in idt_src.types) {
-						if (idt_src.isLocalizable(col) && idt_src.data[key][col] != "")
-							idt_src.data[key][col] = po.translate(idt_src.data[key][col]);
+				if (WScript.Arguments.Unnamed.Length >= 3) {
+					// Translate records.
+					var po = new POCatalog(WScript.Arguments.Unnamed(2));
+					for (var key in idt_src.data) {
+						for (var col in idt_src.types) {
+							if (idt_src.isLocalizable(col) && idt_src.data[key][col] != "")
+								idt_src.data[key][col] = po.translate(idt_src.data[key][col]);
+						}
 					}
 				}
 
diff --git a/String.js b/String.js
index b588c57..6444baa 100644
--- a/String.js
+++ b/String.js
@@ -143,21 +143,26 @@ function Time2Str(date)
 function CodePageToId(codepage)
 {
 	switch (codepage) {
-		case 932 : return "shift-jis";
-		case 936 : return "gb2312";
-		case 949 : return "euc-kr";
-		case 950 : return "big5";
-		case 874 :
-		case 1250:
-		case 1251:
-		case 1252:
-		case 1253:
-		case 1254:
-		case 1255:
-		case 1256:
-		case 1257:
-		case 1258: return "windows-" + codepage;
-		default  : throw new Error("Unsupported code page.");
+		case 0: {
+			var wsh = new ActiveXObject("WScript.Shell");
+			return CodePageToId(parseInt(wsh.RegRead("HKLM\\SYSTEM\\CurrentControlSet\\Control\\Nls\\CodePage\\ACP"), 10));
+		}
+		case 932  : return "shift-jis";
+		case 936  : return "gb2312";
+		case 949  : return "euc-kr";
+		case 950  : return "big5";
+		case 874  :
+		case 1250 :
+		case 1251 :
+		case 1252 :
+		case 1253 :
+		case 1254 :
+		case 1255 :
+		case 1256 :
+		case 1257 :
+		case 1258 : return "windows-" + codepage.toString(10);
+		case 65001: return "utf-8";
+		default   : throw new Error("Unsupported code page.");
 	}
 }
 
diff --git a/UI/Makefile b/UI/Makefile
index 100e9fccc541a128f99e8b3ea2481137c1bbff36..f066cc57321e7b2528f4cef22a18ee92af9589c1 100644
GIT binary patch
delta 576
zcmX@NiEY*bwhc1u?1~JY3~mg5lN;Hjr(f`76j0`6;9^i@aAgPrLVqAuU<hDHWGDjS
zT!vJJ5+E*`Y}hUeRxGW+kjYRCR8q>2$B+V)N(1uqfOHCj-t>o_jFOXO*e#}qg){O^
zUr@-%$EY}ceIcXx<U=(=tN}p7ZKpq+#;84+gI#3$x#^5EHh*A$kTLn1q|)R+1v1m$
zr84qOHpusx>{H<|IU!$a`Z@(hw#i0iVqmSBlP^|mo~#x+XR<*R%jTw%FN~8L%Dlju
zCRMD#RJPfm>HyQ^5JiE_T(y_tAclXqZ!>wr9iGWv6)uxMRLNj!0-DV?nNLG#bJYE9
zPLmJ3DBC_kiE#%TLidAb5<urUO+TQ;sDQ(L+t2ARu9KX6O^<J~gfY+b1#XOU!1|{v
z7%_SPHQP=9;K3+|YWMbUo{Ubi(|4sXs%_6mXEb7j=(v!{h{b2yau^$!CbzjuOupeE
zH2p&YBiHtQd5l+>z<MU7>rGE6VpN*0P{f$Vs4&^EOdK`%whNRpzG9s`Erf4U2-|jv
ZYQ`UuaE&?B7|T!{1`6=$X)_pK007G|%Lf1e

delta 801
zcmbQWfbHBSwhc1ulTWc*OrO@rIA^m8=YtGRLk1%TQy}J?%qgureL_4V%Ve!0iOEbH
zGK{v9<vGNsFOy}on%q!SHF;C65vL-9D}xV1FoWx4!@JHv(VEGA99q+_Wizguyp3IC
zau3Ih&1oe+7?DhkE%Qb-%x3bL5~=A8&Wv`G9m*9jOm#(;R>ClTa^D@k$rF-UHs7mQ
z$HWeG{N#xm!kgz*Uy4Ju$!)S#B_G(PNq6~xY#zpn$?J1XQ9R*~u4b~_Z8i*BH}~DS
z=7i*_hg#Cx>*N_l*ikKvnO^72=rDQ06RF7#Pq?tzHr+v;Q4B>DR{ORe(_maDiDaRz
ziS+b7C&oFb_E}8d=gcSpGA;%q93A0uaTwm&?&iw4Oa>l$7ZpXPH^eiFY!^ymG-5=z
zq9K{F28-!H;W|u%Gg28Fn2_B4&|7j_2IB`NbVDzsGOA1u$YxBzVlqrF4bymqT*g<d
p2;;YN7Blinp_{#`kP(u;rmyN{ltHy%x?nHkb_{c;8}&23006qr{0aa7