QE localization fixed for Qt6

Quick-Event · Jul 12, 2023 · 77beef2 · 77beef2
1 parent 9f04624
commit 77beef2
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 22 deletions.
diff --git a/libquickevent/libquickeventcore/CMakeLists.txt b/libquickevent/libquickeventcore/CMakeLists.txt
@@ -38,9 +38,9 @@ else()
         libquickeventcore-ru_RU.ts
         libquickeventcore-uk_UA.ts
         )
-    target_sources(libquickeventcore PRIVATE ${QM_FILES})
 endif()
 
+target_sources(libquickeventcore PRIVATE ${QM_FILES})
 target_compile_definitions(libquickeventcore PRIVATE QUICKEVENTCORE_BUILD_DLL)
 target_link_libraries(libquickeventcore PUBLIC Qt::Core Qt::Sql libsiut)
 target_include_directories(libquickeventcore PUBLIC include)

diff --git a/libquickevent/libquickeventgui/CMakeLists.txt b/libquickevent/libquickeventgui/CMakeLists.txt
@@ -28,9 +28,9 @@ else()
         libquickeventgui-ru_RU.ts
         libquickeventgui-uk_UA.ts
         )
-    target_sources(libquickeventgui PRIVATE ${QM_FILES})
 endif()
 
+target_sources(libquickeventgui PRIVATE ${QM_FILES})
 target_compile_definitions(libquickeventgui PRIVATE QUICKEVENTGUI_BUILD_DLL)
 target_link_libraries(libquickeventgui PUBLIC Qt::Core Qt::Multimedia libquickeventcore libqfqmlwidgets)
 target_include_directories(libquickeventgui PUBLIC include)

diff --git a/libsiut/CMakeLists.txt b/libsiut/CMakeLists.txt
@@ -28,9 +28,9 @@ else()
         libsiut-ru_RU.ts
         libsiut-uk_UA.ts
         )
-    target_sources(libsiut PRIVATE ${QM_FILES})
 endif()
 
+target_sources(libsiut PRIVATE ${QM_FILES})
 target_compile_definitions(libsiut PRIVATE SIUT_BUILD_DLL)
 target_link_libraries(libsiut PUBLIC Qt::Core Qt::SerialPort libqfcore)
 target_include_directories(libsiut PUBLIC include)

diff --git a/quickevent/app/quickevent/src/main.cpp b/quickevent/app/quickevent/src/main.cpp
@@ -16,8 +16,6 @@
 #include <QtQml>
 #include <QLocale>
 
-//#include <iostream>
-
 NecroLog::MessageHandler old_message_handler;
 bool send_log_entry_recursion_lock = false;
 
@@ -115,9 +113,16 @@ int main(int argc, char *argv[])
 
 		qfInfo() << "Loading translations for:" << lc_name;
 
-		for(QString file_name : {"libqfcore", "libqfqmlwidgets", "libquickeventcore", "libquickeventgui", "libsiut", "quickevent"}) {
+		for(const auto &file_name : {
+				QStringLiteral("libqfcore"),
+				QStringLiteral("libqfqmlwidgets"),
+				QStringLiteral("libquickeventcore"),
+				QStringLiteral("libquickeventgui"),
+				QStringLiteral("libsiut"),
+				QStringLiteral("quickevent"),
+		}) {
 			QTranslator *translator = new QTranslator(&app);
-			bool ok = translator->load(QLocale(lc_name), file_name, QString("-"), QString(":/i18n"));
+			bool ok = translator->load(QLocale(lc_name), file_name, QString("-"), QString("translations"));
 			if (ok) {
 				ok = QCoreApplication::installTranslator(translator);
 			}
@@ -126,11 +131,12 @@ int main(int argc, char *argv[])
 
 		{
 			QTranslator *translator = new QTranslator(&app);
-			bool ok = translator->load(QLocale(lc_name), QString("qtbase"), QString("_"), QString(":/i18n"));
+			const auto file_name = QStringLiteral("qt");
+			bool ok = translator->load(QLocale(lc_name), file_name, QString("_"), QString("translations"));
 			if (ok) {
 				ok = QCoreApplication::installTranslator(translator);
 			}
-			qfInfo() << "Installing translator file: qtbase ... " << (ok ? "OK" : "ERROR");
+			qfInfo() << "Installing translator file:" << file_name << "... " << (ok ? "OK" : "ERROR");
 		}
 	}
 

diff --git a/quickshow/CMakeLists.txt b/quickshow/CMakeLists.txt
@@ -29,9 +29,9 @@ else()
         quickshow-ru_RU.ts
         quickshow-uk_UA.ts
         )
-    target_sources(quickshow PRIVATE ${QM_FILES})
 endif()
 
+target_sources(quickshow PRIVATE ${QM_FILES})
 target_link_libraries(quickshow PRIVATE Qt::Widgets Qt::Sql libqfcore)
 target_include_directories(quickshow PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 

diff --git a/quickshow/src/main.cpp b/quickshow/src/main.cpp
@@ -52,14 +52,27 @@ int main(int argc, char *argv[])
 
 		qfInfo() << "Loading translations for:" << lc_name;
 
-		for(QString file_name : {"libqfcore", "libqfqmlwidgets", "quickshow"}) {
+		for(const auto &file_name : {
+			QStringLiteral("libqfcore"),
+			QStringLiteral("libqfqmlwidgets"),
+			QStringLiteral("quickshow"),
+		}) {
 			QTranslator *translator = new QTranslator(&app);
 			bool ok = translator->load(QLocale(lc_name), file_name, QString("-"), QString(":/i18n"));
 			if (ok) {
 				ok = QCoreApplication::installTranslator(translator);
 			}
 			qfInfo() << "Installing translator file:" << file_name << " ... " << (ok? "OK": "ERROR");
 		}
+		{
+			QTranslator *translator = new QTranslator(&app);
+			const auto file_name = QStringLiteral("qt");
+			bool ok = translator->load(QLocale(lc_name), file_name, QString("_"), QString("translations"));
+			if (ok) {
+				ok = QCoreApplication::installTranslator(translator);
+			}
+			qfInfo() << "Installing translator file:" << file_name << "... " << (ok ? "OK" : "ERROR");
+		}
 	}
 
 	MainWindow w;

diff --git a/tools/qsqlmon/CMakeLists.txt b/tools/qsqlmon/CMakeLists.txt
@@ -40,9 +40,9 @@ else()
         qsqlmon-ru_RU.ts
         qsqlmon-uk_UA.ts
         )
-    target_sources(qsqlmon PRIVATE ${QM_FILES})
 endif()
 
+target_sources(qsqlmon PRIVATE ${QM_FILES})
 target_link_libraries(qsqlmon PRIVATE libqfqmlwidgets)
 target_include_directories(qsqlmon PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
 

diff --git a/tools/qsqlmon/src/main.cpp b/tools/qsqlmon/src/main.cpp
@@ -25,16 +25,6 @@ int main(int argc, char *argv[])
 
 	qfInfo() << QCoreApplication::applicationName() << "ver." << QCoreApplication::applicationVersion();
 
-	//qfError() << "qfError() test OK.";
-	//qfWarning() << "qfWarning() test OK.";
-	//qfInfo() << "qfInfo() test OK.";
-	//qfDebug() << "qfDebug() test OK.";
-
-	//QLocale::setDefault(QLocale(QLocale::Czech, QLocale::CzechRepublic));
-	//QLocale::setDefault(QLocale::system());
-	/// defaultni locales jsou z LC_ALL
-	qfInfo() << "Default locale set to:" << QLocale().name();
-
 	TheApp app(argc, argv);
 
 	MainWindow main_window;