From c2b96dbcc1d7a4e0cb551f76d121a2b287bfdfd7 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Tue, 11 Feb 2020 11:58:12 +0100
Subject: [PATCH] Automate language-dependent folder property names

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 MSI/ZRCola/Main/Makefile          | Bin 294738 -> 294948 bytes
 Updater                           |   2 +-
 ZRCola/MSIBuild/Makefile          |   8 ++++++--
 lib/libZRColaUI/MSIBuild/Makefile |   8 ++++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile
index f98f4a4e4fd2d31dd312a06ffd83c3d83544d599..0e17da6d9f1372d96c182a728c01b26a8fad65be 100644
GIT binary patch
delta 236
zcmccgPjE?t(1tT?lhxR?SmPPo8A2!fv$;Z8n<umR3QsQLmzdng#>NenWbkBgVbGkM
zC>uW6PHGDdx$?;c(l>C(f%FMYz9Y>w`H;*EY-*YlW!n>F8G)Dyh?%!1%Cf}rOkd^7
zA~8KeorPz5fhG$ZHht4CYO#n;pOwkNGx>uc8>bJ0BZD8%JDQUp%8G8^r^PZQ1OV7d
BKY9QF

delta 221
zcmZ3|Aav=U;D$47o9oy`gxP}_LK%Q~a=&Q!<bAS2lcS`$CKt%COg<(iGWnmJ2#}ux
zQ?vQKv_B(zFoO?6FoP#l!xlLIy>xlAkbJw4JR=Y@0WtG-A$gW(+>;l`a7_LqDIggI
zw8xpjAE@0Ci2Z?VsNK^qs<VhrPta!J<1At*WrzofPj5_P5uMy3V}eB+)CCA_lZE8v
LwolMznGym3tvNcp

diff --git a/Updater b/Updater
index e6c51e9..e7954e7 160000
--- a/Updater
+++ b/Updater
@@ -1 +1 @@
-Subproject commit e6c51e923f254464a12a2fdfe76972e30fa403d9
+Subproject commit e7954e7c7362acea606fa46f349b143ce4b1080f
diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile
index c5dcb98..e9e08ad 100644
--- a/ZRCola/MSIBuild/Makefile
+++ b/ZRCola/MSIBuild/Makefile
@@ -23,6 +23,10 @@
 !ERROR Parameter MSIBUILD_LANGID is undefined.
 !ENDIF
 
+!IFNDEF MSIBUILD_LANG_GUID
+!ERROR Parameter MSIBUILD_LANG_GUID is undefined.
+!ENDIF
+
 MSIBUILD_IS_LOCALIZEABLE=1
 
 
@@ -109,10 +113,10 @@ compZRCola.exe.Win32	{F30B6545-6203-4B7D-8575-85245A0F90E5}	ZRCOLABINDIR	0		file
 compZRCola.exe.x64	{D45B105D-2303-459A-AF4B-52AC3AAD5510}	ZRCOLABINDIR	256		fileZRCola.exe.x64
 !ENDIF
 !IF "$(LANG)" == "ru_RU"
-compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
+compZRCola.mo.ru_RU	{DEA5D11C-2B0E-4B85-ACE3-D76334866F50}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.ru_RU
 !ENDIF
 !IF "$(LANG)" == "sl_SI"
-compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
+compZRCola.mo.sl_SI	{7FF95C71-D8DE-4D2B-A26D-FEB5A1F54D63}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		fileZRCola.mo.sl_SI
 !ENDIF
 <<NOKEEP
 
diff --git a/lib/libZRColaUI/MSIBuild/Makefile b/lib/libZRColaUI/MSIBuild/Makefile
index d54b98c..66b5da1 100644
--- a/lib/libZRColaUI/MSIBuild/Makefile
+++ b/lib/libZRColaUI/MSIBuild/Makefile
@@ -23,6 +23,10 @@
 !ERROR Parameter MSIBUILD_LANGID is undefined.
 !ENDIF
 
+!IFNDEF MSIBUILD_LANG_GUID
+!ERROR Parameter MSIBUILD_LANG_GUID is undefined.
+!ENDIF
+
 
 ######################################################################
 # Component
@@ -36,10 +40,10 @@ Component	ComponentId	Directory_	Attributes	Condition	KeyPath
 s$(MSIBUILD_LENGTH_ID)	S38	s$(MSIBUILD_LENGTH_ID)	i2	S255	S$(MSIBUILD_LENGTH_ID)
 Component	Component
 !IF "$(LANG)" == "ru_RU"
-complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOCRURUDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
+complibZRColaUI.mo.ru_RU	{2099A205-5D5E-4AD9-BD31-EECC87FEAB47}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.ru_RU
 !ENDIF
 !IF "$(LANG)" == "sl_SI"
-complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOCSLSIDIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.sl_SI
+complibZRColaUI.mo.sl_SI	{EAE1C699-8415-4FC6-9EC7-FE74AFC432A9}	ZRCOLALOC$(MSIBUILD_LANG_GUID)DIR	$(MSIBUILD_COMPONENT_ATTRIB_FILE)		filelibZRColaUI.mo.sl_SI
 !ENDIF
 <<NOKEEP