From 58553647a51f039cf54fc4e34d9cb787715164be Mon Sep 17 00:00:00 2001
From: Karim ElDeeb <keldeeb@gmail.com>
Date: Sun, 25 Nov 2018 15:41:46 +0200
Subject: [PATCH] Add the missing *.qm translations files

The *.qm translations files were missing from being bundled with the installer, so the default strings weren't translated and were defaulting to English.

See #1592.
---
 installer/windows/build.cmd        |   5 +-
 installer/windows/product.wxs      |   3 +
 installer/windows/translations.wxs | 220 +++++++++++++++++++++++++++++
 3 files changed, 226 insertions(+), 2 deletions(-)
 create mode 100644 installer/windows/translations.wxs

diff --git a/installer/windows/build.cmd b/installer/windows/build.cmd
index 3485582d..427bb52f 100644
--- a/installer/windows/build.cmd
+++ b/installer/windows/build.cmd
@@ -39,9 +39,10 @@ set ICE=-sice:ICE03 -sice:ICE82 -sice:ICE61 -sice:ICE38 -sice:ICE43 -sice:ICE57
 set LIGHT=-sw1104
 
 :: Compile & Link
-"%WIX%\bin\candle.exe" -nologo -pedantic -arch %ARCH% %SQLCIPHER% product.wxs
-"%WIX%\bin\light.exe" -sval -nologo -pedantic %LIGHT% %ICE% -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc strings.wxl product.wixobj -out %MSI%.msi
+"%WIX%\bin\candle.exe" -nologo -pedantic -arch %ARCH% %SQLCIPHER% product.wxs translations.wxs
+"%WIX%\bin\light.exe" -sval -nologo -pedantic %LIGHT% %ICE% -ext WixUIExtension -ext WixUtilExtension -cultures:en-us -loc strings.wxl product.wixobj translations.wixobj -out %MSI%.msi
 
 :: Cleanup
 del product.wixobj
+del translations.wixobj
 del %MSI%.wixpdb
diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
index 58cd64ab..363b6ad2 100644
--- a/installer/windows/product.wxs
+++ b/installer/windows/product.wxs
@@ -137,6 +137,9 @@
                 </Feature>
             </Feature>
 
+            <!-- Translations -->
+            <ComponentGroupRef Id="TranslationsGroup" />
+
             <!-- Bearer -->
             <?if $(sys.BUILDARCH)="x64"?>
             <ComponentRef Id="qgenericbearer.dll" />
diff --git a/installer/windows/translations.wxs b/installer/windows/translations.wxs
new file mode 100644
index 00000000..c8bc0951
--- /dev/null
+++ b/installer/windows/translations.wxs
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+    <?include variables.wxi ?>
+
+    <Fragment Id="TranslationsFragment">
+
+        <DirectoryRef Id='INSTALLDIR'>
+
+            <!--
+            Each language requires 6 *.qm files to work properly.
+            
+            The list of the required files:
+                - qt_<language_code>.qm
+                - qtbase_<language_code>.qm
+                - qtmultimedia_<language_code>.qm
+                - qtquick1_<language_code>.qm
+                - qtscript_<language_code>.qm
+                - qtxmlpatterns_<language_code>.qm
+
+            Notes:
+                - Arabic is missing "qtquick1_ar.qm" and "qtxmlpatterns_ar.qm" but seems to work without a problem.
+
+                - Chinese (China), Chinese (Taiwan), and Portuguese have only one file (qt_<language_code>.qm), so
+                  the default buttons are not translated for these languages.
+
+                - Turkish language doesn't have any *.qm files at all, so no default buttons translation also.
+            -->
+
+            <Directory Id="translations" Name="translations">
+
+                <!-- Arabic -->
+                <Component><File Source="$(var.QtPath)\translations\qt_ar.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_ar.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_ar.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_ar.qm" /></Component>
+
+                <!-- Chinese (China) -->
+                <Component><File Source="$(var.QtPath)\translations\qt_zh_CN.qm" /></Component>
+
+                <!-- Chinese (Taiwan) -->
+                <Component><File Source="$(var.QtPath)\translations\qt_zh_TW.qm" /></Component>
+
+                <!-- Czech -->
+                <Component><File Source="$(var.QtPath)\translations\qt_cs.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_cs.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_cs.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_cs.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_cs.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_cs.qm" /></Component>
+
+                <!-- English (United Kingdom) -->
+                <Component><File Source="$(var.QtPath)\translations\qt_en.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_en.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_en.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_en.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_en.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_en.qm" /></Component>
+
+                <!-- French -->
+                <Component><File Source="$(var.QtPath)\translations\qt_fr.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_fr.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_fr.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_fr.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_fr.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_fr.qm" /></Component>
+
+                <!-- German -->
+                <Component><File Source="$(var.QtPath)\translations\qt_de.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_de.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_de.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_de.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_de.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_de.qm" /></Component>
+
+                <!-- Korean -->
+                <Component><File Source="$(var.QtPath)\translations\qt_ko.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_ko.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_ko.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_ko.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_ko.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_ko.qm" /></Component>
+
+                <!-- Polish -->
+                <Component><File Source="$(var.QtPath)\translations\qt_pl.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_pl.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_pl.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_pl.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_pl.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_pl.qm" /></Component>
+
+                <!-- Portuguese -->
+                <Component><File Source="$(var.QtPath)\translations\qt_pt.qm" /></Component>
+
+                <!-- Russian -->
+                <Component><File Source="$(var.QtPath)\translations\qt_ru.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_ru.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_ru.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_ru.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_ru.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_ru.qm" /></Component>
+
+                <!-- Spanish -->
+                <Component><File Source="$(var.QtPath)\translations\qt_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_es.qm" /></Component>
+
+                <!-- Turkish -->
+
+                <!-- Ukrainian -->
+                <Component><File Source="$(var.QtPath)\translations\qt_uk.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_uk.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_uk.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtquick1_uk.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_uk.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_uk.qm" /></Component>
+
+            </Directory>
+
+        </DirectoryRef>
+
+        <ComponentGroup Id="TranslationsGroup">
+
+            <!-- Arabic -->
+            <ComponentRef Id="qt_ar.qm" />
+            <ComponentRef Id="qtbase_ar.qm" />
+            <ComponentRef Id="qtmultimedia_ar.qm" />
+            <ComponentRef Id="qtscript_ar.qm" />
+
+            <!-- Chinese (China) -->
+            <ComponentRef Id="qt_zh_CN.qm" />
+
+            <!-- Chinese (Taiwan) -->
+            <ComponentRef Id="qt_zh_TW.qm" />
+
+            <!-- Czech -->
+            <ComponentRef Id="qt_cs.qm" />
+            <ComponentRef Id="qtbase_cs.qm" />
+            <ComponentRef Id="qtmultimedia_cs.qm" />
+            <ComponentRef Id="qtquick1_cs.qm" />
+            <ComponentRef Id="qtscript_cs.qm" />
+            <ComponentRef Id="qtxmlpatterns_cs.qm" />
+
+            <!-- English (United Kingdom) -->
+            <ComponentRef Id="qt_en.qm" />
+            <ComponentRef Id="qtbase_en.qm" />
+            <ComponentRef Id="qtmultimedia_en.qm" />
+            <ComponentRef Id="qtquick1_en.qm" />
+            <ComponentRef Id="qtscript_en.qm" />
+            <ComponentRef Id="qtxmlpatterns_en.qm" />
+
+            <!-- French -->
+            <ComponentRef Id="qt_fr.qm" />
+            <ComponentRef Id="qtbase_fr.qm" />
+            <ComponentRef Id="qtmultimedia_fr.qm" />
+            <ComponentRef Id="qtquick1_fr.qm" />
+            <ComponentRef Id="qtscript_fr.qm" />
+            <ComponentRef Id="qtxmlpatterns_fr.qm" />
+
+            <!-- German -->
+            <ComponentRef Id="qt_de.qm" />
+            <ComponentRef Id="qtbase_de.qm" />
+            <ComponentRef Id="qtmultimedia_de.qm" />
+            <ComponentRef Id="qtquick1_de.qm" />
+            <ComponentRef Id="qtscript_de.qm" />
+            <ComponentRef Id="qtxmlpatterns_de.qm" />
+
+            <!-- Korean -->
+            <ComponentRef Id="qt_ko.qm" />
+            <ComponentRef Id="qtbase_ko.qm" />
+            <ComponentRef Id="qtmultimedia_ko.qm" />
+            <ComponentRef Id="qtquick1_ko.qm" />
+            <ComponentRef Id="qtscript_ko.qm" />
+            <ComponentRef Id="qtxmlpatterns_ko.qm" />
+
+            <!-- Polish -->
+            <ComponentRef Id="qt_pl.qm" />
+            <ComponentRef Id="qtbase_pl.qm" />
+            <ComponentRef Id="qtmultimedia_pl.qm" />
+            <ComponentRef Id="qtquick1_pl.qm" />
+            <ComponentRef Id="qtscript_pl.qm" />
+            <ComponentRef Id="qtxmlpatterns_pl.qm" />
+
+            <!-- Portuguese -->
+            <ComponentRef Id="qt_pt.qm" />
+
+            <!-- Russian -->
+            <ComponentRef Id="qt_ru.qm" />
+            <ComponentRef Id="qtbase_ru.qm" />
+            <ComponentRef Id="qtmultimedia_ru.qm" />
+            <ComponentRef Id="qtquick1_ru.qm" />
+            <ComponentRef Id="qtscript_ru.qm" />
+            <ComponentRef Id="qtxmlpatterns_ru.qm" />
+
+            <!-- Spanish -->
+            <ComponentRef Id="qt_es.qm" />
+            <ComponentRef Id="qtbase_es.qm" />
+            <ComponentRef Id="qtmultimedia_es.qm" />
+            <ComponentRef Id="qtquick1_es.qm" />
+            <ComponentRef Id="qtscript_es.qm" />
+            <ComponentRef Id="qtxmlpatterns_es.qm" />
+
+            <!-- Turkish -->
+
+            <!-- Ukrainian -->
+            <ComponentRef Id="qt_uk.qm" />
+            <ComponentRef Id="qtbase_uk.qm" />
+            <ComponentRef Id="qtmultimedia_uk.qm" />
+            <ComponentRef Id="qtquick1_uk.qm" />
+            <ComponentRef Id="qtscript_uk.qm" />
+            <ComponentRef Id="qtxmlpatterns_uk.qm" />
+
+        </ComponentGroup>
+
+    </Fragment>
+
+</Wix>