Use uiLanguages preferences (#84)

IB-7564 Signed-off-by: Raul Metsma <[email protected]>
open-eid · Jun 25, 2023 · 00d27dd · 00d27dd
1 parent 89efee9
commit 00d27dd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -51,7 +51,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: 6.5.0
+        version: 6.5.1
         arch: win64_msvc2019_64
         modules: qt5compat
     - name: Setup dev env
@@ -60,8 +60,8 @@ jobs:
         arch: x64
     - name: Build
       run: |
-        cmake "-GNinja" -S . -B build `
-          -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
+        cmake -S . -B build `
+          -DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
         cmake --build build --target installer
     - name: Archive artifacts
       uses: actions/upload-artifact@v3

diff --git a/Application.cpp b/Application.cpp
@@ -55,7 +55,14 @@ Application::Application( int &argc, char **argv )
 	QTranslator *qt = new QTranslator( this );
 	QTranslator *common = new QTranslator( this );
 	QTranslator *t = new QTranslator( this );
-	QString lang = Common::language();
+	QString lang;
+	auto languages = QLocale().uiLanguages().first();
+	if(languages.contains(QLatin1String("et"), Qt::CaseInsensitive))
+		lang = QStringLiteral("et");
+	else if(languages.contains(QLatin1String("ru"), Qt::CaseInsensitive))
+		lang = QStringLiteral("ru");
+	else
+		lang = QStringLiteral("en");
 	void(qt->load(QStringLiteral(":/qtbase_%1.qm").arg(lang)));
 	void(common->load(QStringLiteral(":/common_%1.qm").arg(lang)));
 	void(t->load(QStringLiteral(":/idupdater_%1.qm").arg(lang)));

diff --git a/common b/common
diff --git a/idupdater.cpp b/idupdater.cpp
@@ -104,8 +104,8 @@ idupdater::idupdater( QObject *parent )
 	, conf(new Configuration(this))
 {
 	QString userAgent = QStringLiteral("%1/%2 (%3) Lang: %4 Devices: %5")
-		.arg(qApp->applicationName(), qApp->applicationVersion(), Common::applicationOs(),
-			Common::language(), QPCSC::instance().drivers().join('/'));
+		.arg(QApplication::applicationName(), QApplication::applicationVersion(), Common::applicationOs(),
+			QLocale().uiLanguages().first(), QPCSC::instance().drivers().join('/'));
 	qDebug() << "User-Agent:" << userAgent;
 	request.setRawHeader( "User-Agent", userAgent.toUtf8() );
 	connect(conf, &Configuration::finished, this, &idupdater::finished);
+2 −1		.github/workflows/build.yml
+7 −19		Common.cpp
+0 −2		Common.h
+26 −54		Configuration.cpp
+0 −2		Configuration.h
+39 −68		QPCSC.cpp
+0 −2		QPCSC.h
+6 −14		QPCSC_p.h
+0 −19		translations/common_en.ts
+0 −19		translations/common_et.ts
+0 −19		translations/common_pt-br.ts
+0 −19		translations/common_ru.ts