Create locale neutral installer (open-eid#1233)

IB-7694

Signed-off-by: Raul Metsma <[email protected]>

.github/workflows/build.yml

@@ -104,12 +104,18 @@ jobs:
     container: ${{ matrix.container }}
     strategy:
       matrix:
-        container: ['fedora:37', 'fedora:38']
+        container: ['fedora:38', 'fedora:39']
     steps:
     - name: Install Deps
       run: |
         dnf install -y --setopt=install_weak_deps=False \
         git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel qt6-qt5compat-devel flatbuffers-devel flatbuffers-compiler zlib-devel
+    - name: Install CMake
+      if: matrix.container == 'fedora:39'
+      run: |
+        dnf install -y --setopt=install_weak_deps=False wget
+        wget -q https://github.com/Kitware/CMake/releases/download/v3.28.1/cmake-3.28.1-linux-x86_64.sh
+        sh cmake-3.28.1-linux-x86_64.sh --skip-license --prefix=/usr/local
     - name: Checkout
       uses: actions/checkout@v4
       with:

client/CMakeLists.txt

@@ -218,7 +218,7 @@ elseif(WIN32)
 		set(PLATFORM x86)
 		set(OPENSSL_SUFFIX "")
 	endif()
-	set(MSI_FILE "Digidoc4_Client-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}")
+	set(MSI_FILE "Digidoc4-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}")
 	list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo
 		-arch ${PLATFORM}
 		-dMSI_VERSION=${VERSION}
@@ -239,12 +239,10 @@ elseif(WIN32)
 	add_custom_target(msi DEPENDS ${PROJECT_NAME}
 		COMMAND "$ENV{WIX}bin\\heat.exe" dir ${LIBS_PATH}/schema -nologo -cg Schemas -gg -scom -sreg -sfrag -srd -dr SchemaFolder -var var.schemasLocation -out SchemasFragment.wxs
 		COMMAND ${CANDLE_CMD}
-		COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.msi"
-		COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.msi"
+		COMMAND ${LIGHT_CMD} -o "${MSI_FILE}.msi"
 		#Build MSI with QT
 		COMMAND ${CANDLE_CMD} -dqt_path=${qtCore_install_prefix}
-		COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.qt.msi"
-		COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.qt.msi"
+		COMMAND ${LIGHT_CMD} -o "${MSI_FILE}.qt.msi"
 		WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 	)
 	if(SIGNCERT)

client/mac/Info.plist.cmake

@@ -13,7 +13,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+	<string>DigiDoc4</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSupportedPlatforms</key>
@@ -31,9 +31,7 @@
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>NSAppleEventsUsageDescription</key>
-	<string>DigiDoc4 Client can use AppleScript to talk with apps, for example to insert attachments to emails.</string>
-	<key>LSHasLocalizedDisplayName</key>
-	<true/>
+	<string>DigiDoc4 can use AppleScript to talk with apps, for example to insert attachments to emails.</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>
@@ -169,7 +167,7 @@
 			<key>NSMenuItem</key>
 			<dict>
 				<key>default</key>
-				<string>Sign with DigiDoc4 Client</string>
+				<string>Sign with DigiDoc4</string>
 			</dict>
 			<key>NSMessage</key>
 			<string>signClient</string>
@@ -189,7 +187,7 @@
 			<key>NSMenuItem</key>
 			<dict>
 				<key>default</key>
-				<string>Encrypt with DigiDoc4 Client</string>
+				<string>Encrypt with DigiDoc4</string>
 			</dict>
 			<key>NSMessage</key>
 			<string>openCrypto</string>

client/mac/Resources/et.lproj/ServicesMenu.strings

@@ -1,2 +1,2 @@
-"Sign with DigiDoc4 Client" = "Allkirjasta DigiDoc4 klient rakendusega";
-"Encrypt with DigiDoc4 Client" = "Krüpteeri DigiDoc4 klient rakendusega";
+"Sign with DigiDoc4" = "Allkirjasta DigiDoc4 rakendusega";
+"Encrypt with DigiDoc4" = "Krüpteeri DigiDoc4 rakendusega";

client/mac/Resources/ru.lproj/ServicesMenu.strings

@@ -1,2 +1,2 @@
-"Sign with DigiDoc4 Client" = "Подпишите с помощью приложения DigiDoc4";
-"Encrypt with DigiDoc4 Client" = "Зашифруйте с помощью приложения DigiDoc4";
+"Sign with DigiDoc4" = "Подпишите с помощью приложения DigiDoc4";
+"Encrypt with DigiDoc4" = "Зашифруйте с помощью приложения DigiDoc4";

client/qdigidoc4.desktop

@@ -5,9 +5,7 @@ Type=Application
 Exec=qdigidoc4 %F
 Icon=qdigidoc4
 
-Name=DigiDoc4 Client
-Name[et]=DigiDoc4 klient
-Name[ru]=DigiDoc4 клиент
+Name=DigiDoc4
 
 Keywords=ID-card;Utility;
 Keywords[et_EE]=ID-kaart;Haldusvahend;

client/qdigidoc4.rc

@@ -21,23 +21,23 @@ BEGIN
 		BLOCK "040904B0"
 		BEGIN
 			VALUE "CompanyName", "RIA"
-			VALUE "FileDescription", "DigiDoc4 Client"
+			VALUE "FileDescription", "DigiDoc4"
 			VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
 			VALUE "InternalName", "qdigidoc4"
 			VALUE "LegalCopyright", "Copyright (C) 2017-2023 Estonian Information System Authority"
 			VALUE "OriginalFilename", "qdigidoc4.exe"
-			VALUE "ProductName", "DigiDoc4 Client"
+			VALUE "ProductName", "DigiDoc4"
 			VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
 		END
 		BLOCK "042504B0"
 		BEGIN
 			VALUE "CompanyName", "RIA"
-			VALUE "FileDescription", "DigiDoc4 Klient"
+			VALUE "FileDescription", "DigiDoc4"
 			VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
 			VALUE "InternalName", "qdigidoc4"
 			VALUE "LegalCopyright", "Copyright (C) 2017-2023 Riigi Infosüsteemi Amet"
 			VALUE "OriginalFilename", "qdigidoc4.exe"
-			VALUE "ProductName", "DigiDoc4 Klient"
+			VALUE "ProductName", "DigiDoc4"
 			VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
 		END
 	END

qdigidoc4.wxs

@@ -51,20 +51,13 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
 
     <Directory Id="TARGETDIR" Name="SourceDir">
       <!-- Program Menu shortcut -->
-      <Directory Id="ProgramMenuFolder">
-        <Directory Id="ProgramMenuDir" Name="!(loc.idcardLabel)">
-          <Component Id="ProgramMenuDir4" Guid="16A9EACF-B5D3-4FDC-8E9F-C03C8FA46DFF">
-            <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-            <RegistryValue Root='HKMU' Key='Software\[Manufacturer]\[APPLICATIONNAME]' Type='string' Value='' KeyPath='yes' />
-          </Component>
-        </Directory>
-      </Directory>
+      <Directory Id="ProgramMenuFolder" />
 
       <!-- Desktop shortcut -->
       <Directory Id="DesktopFolder">
         <Component Id="DesktopShortcut4" Guid="7B821ED0-4838-4290-997C-AA4119F99DAD" Transitive="yes">
           <Condition>DESKTOP_SHORTCUT = 1</Condition>
-          <Shortcut Id="ClientDesktopShortcut4" Name="!(loc.qdigidoc4Label)"
+          <Shortcut Id="ClientDesktopShortcut4" Name="DigiDoc4"
                     Target="[!qdigidoc4.exe]" WorkingDirectory="APPLICATIONFOLDER"/>
           <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[APPLICATIONNAME]" Name="DesktopShortcut4" Value="1" Type="integer" KeyPath="yes"/>
         </Component>
@@ -74,8 +67,8 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
         <Directory Id="APPLICATIONFOLDER" Name="DigiDoc4 Client">
           <Component Id="Application4" Guid="316B00EB-7519-476F-BCA5-7C8C1A0DF5AB" Transitive="yes">
             <File Source="$(var.client_path)" KeyPath='yes'>
-              <Shortcut Id="ClientStartMenu4" Advertise="yes" Name="!(loc.qdigidoc4Label)" Icon="qdigidoc4.ico"
-                Directory="ProgramMenuDir" WorkingDirectory="APPLICATIONFOLDER"/>
+              <Shortcut Id="ClientStartMenu4" Advertise="yes" Name="DigiDoc4" Icon="qdigidoc4.ico"
+                Directory="ProgramMenuFolder" WorkingDirectory="APPLICATIONFOLDER"/>
             </File>
             <ProgId Id="qdigidoc4.adoc" Description="DigiDoc signed document" Icon="qdigidoc4.exe" IconIndex="1">
               <Extension Id="adoc" ContentType="application/vnd.lt.archyvai.adoc-2008">
@@ -188,7 +181,6 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
     </Directory>
 
     <Feature Id="InstallDigidoc" Level="1" Title="DigiDoc4 Client" Display="expand" ConfigurableDirectory="APPLICATIONFOLDER">
-      <ComponentRef Id='ProgramMenuDir4' />
       <ComponentRef Id="DesktopShortcut4" />
       <ComponentRef Id="Application4"/>
       <ComponentRef Id="Base"/>