From f6ec3c8f9a75495cc85c784b43dbb694abb9b594 Mon Sep 17 00:00:00 2001 From: EndrII Date: Tue, 6 Jul 2021 18:19:01 +0300 Subject: [PATCH 1/2] chenge translations structure --- src/Client/CMakeLists.txt | 13 +++++++++++++ src/{Core => Client}/languages/de.ts | 0 src/{Core => Client}/languages/en.ts | 0 src/{Core => Client}/languages/es.ts | 0 src/{Core => Client}/languages/fr.ts | 0 src/{Core => Client}/languages/ja.ts | 0 src/{Core => Client}/languages/pl.ts | 0 src/{Core => Client}/languages/ru.ts | 0 src/{Core => Client}/languages/tr.ts | 0 src/{Core => Client}/languages/uk.ts | 0 src/{Core => Client}/languages/zh.ts | 0 src/Core/CMakeLists.txt | 13 ------------- 12 files changed, 13 insertions(+), 13 deletions(-) rename src/{Core => Client}/languages/de.ts (100%) rename src/{Core => Client}/languages/en.ts (100%) rename src/{Core => Client}/languages/es.ts (100%) rename src/{Core => Client}/languages/fr.ts (100%) rename src/{Core => Client}/languages/ja.ts (100%) rename src/{Core => Client}/languages/pl.ts (100%) rename src/{Core => Client}/languages/ru.ts (100%) rename src/{Core => Client}/languages/tr.ts (100%) rename src/{Core => Client}/languages/uk.ts (100%) rename src/{Core => Client}/languages/zh.ts (100%) diff --git a/src/Client/CMakeLists.txt b/src/Client/CMakeLists.txt index ecee594..5842a7b 100644 --- a/src/Client/CMakeLists.txt +++ b/src/Client/CMakeLists.txt @@ -72,3 +72,16 @@ if(QT_VERSION_MAJOR EQUAL 6) qt_import_qml_plugins(${CURRENT_PROJECT}) qt_finalize_executable(${CURRENT_PROJECT}) endif() + +set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts + ${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts) + +prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}") diff --git a/src/Core/languages/de.ts b/src/Client/languages/de.ts similarity index 100% rename from src/Core/languages/de.ts rename to src/Client/languages/de.ts diff --git a/src/Core/languages/en.ts b/src/Client/languages/en.ts similarity index 100% rename from src/Core/languages/en.ts rename to src/Client/languages/en.ts diff --git a/src/Core/languages/es.ts b/src/Client/languages/es.ts similarity index 100% rename from src/Core/languages/es.ts rename to src/Client/languages/es.ts diff --git a/src/Core/languages/fr.ts b/src/Client/languages/fr.ts similarity index 100% rename from src/Core/languages/fr.ts rename to src/Client/languages/fr.ts diff --git a/src/Core/languages/ja.ts b/src/Client/languages/ja.ts similarity index 100% rename from src/Core/languages/ja.ts rename to src/Client/languages/ja.ts diff --git a/src/Core/languages/pl.ts b/src/Client/languages/pl.ts similarity index 100% rename from src/Core/languages/pl.ts rename to src/Client/languages/pl.ts diff --git a/src/Core/languages/ru.ts b/src/Client/languages/ru.ts similarity index 100% rename from src/Core/languages/ru.ts rename to src/Client/languages/ru.ts diff --git a/src/Core/languages/tr.ts b/src/Client/languages/tr.ts similarity index 100% rename from src/Core/languages/tr.ts rename to src/Client/languages/tr.ts diff --git a/src/Core/languages/uk.ts b/src/Client/languages/uk.ts similarity index 100% rename from src/Core/languages/uk.ts rename to src/Client/languages/uk.ts diff --git a/src/Core/languages/zh.ts b/src/Client/languages/zh.ts similarity index 100% rename from src/Core/languages/zh.ts rename to src/Client/languages/zh.ts diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt index d02e49a..bfc88bf 100644 --- a/src/Core/CMakeLists.txt +++ b/src/Core/CMakeLists.txt @@ -35,17 +35,4 @@ target_link_libraries(${CURRENT_PROJECT} PUBLIC target_include_directories(${CURRENT_PROJECT} PUBLIC ${PUBLIC_INCUDE_DIR}) target_include_directories(${CURRENT_PROJECT} PRIVATE ${PRIVATE_INCUDE_DIR}) -set(LANGS ${CMAKE_CURRENT_SOURCE_DIR}/languages/en.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/ru.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/uk.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/ja.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/tr.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/zh.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/de.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/fr.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/es.ts - ${CMAKE_CURRENT_SOURCE_DIR}/languages/pl.ts) - -prepareQM(${CURRENT_PROJECT} ${CMAKE_CURRENT_SOURCE_DIR}/../ "${LANGS}") - set(QML_IMPORT_PATH ${QML_IMPORT_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/" CACHE STRING "" FORCE) From 0be176fdbe77c0da545457630f5cb1f722ed4c9e Mon Sep 17 00:00:00 2001 From: EndrII Date: Tue, 6 Jul 2021 18:34:00 +0300 Subject: [PATCH 2/2] move translation to client executable --- src/Client/CrawlClient.qrc | 14 ++++++++++++++ src/Client/main.cpp | 18 ++++++++++++++++++ src/Core/Crawl.qrc | 15 --------------- src/Core/Crawl/clientapp.cpp | 16 ---------------- src/Core/Crawl/clientapp.h | 1 - 5 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 src/Client/CrawlClient.qrc diff --git a/src/Client/CrawlClient.qrc b/src/Client/CrawlClient.qrc new file mode 100644 index 0000000..2bbe423 --- /dev/null +++ b/src/Client/CrawlClient.qrc @@ -0,0 +1,14 @@ + + + languages/de.qm + languages/en.qm + languages/es.qm + languages/fr.qm + languages/ja.qm + languages/pl.qm + languages/ru.qm + languages/tr.qm + languages/uk.qm + languages/zh.qm + + diff --git a/src/Client/main.cpp b/src/Client/main.cpp index 11d0e25..3a9bb69 100644 --- a/src/Client/main.cpp +++ b/src/Client/main.cpp @@ -10,7 +10,22 @@ #include #include #include +#include +void initLang() { + QLocale locale = QLocale::system(); + QString customLanguage = QuasarAppUtils::Params::getArg("lang"); + if(customLanguage.size()) { + locale = QLocale(customLanguage); + } + + if(!QuasarAppUtils::Locales::init(locale, {":/crawlTranslations/languages/", + ":/credits_languages/", + ":/qmlNotify_languages/", + ":/lv_languages/"})){ + QuasarAppUtils::Params::log("Error load language : ", QuasarAppUtils::Error); + } +} int main(int argc, char *argv[]) { @@ -27,5 +42,8 @@ int main(int argc, char *argv[]) if (!client.init(&engine)) { return 1; } + + initLang(); + return app.exec(); } diff --git a/src/Core/Crawl.qrc b/src/Core/Crawl.qrc index d5219e8..f13c238 100644 --- a/src/Core/Crawl.qrc +++ b/src/Core/Crawl.qrc @@ -14,19 +14,4 @@ CrawlModule/DefaultMenu.qml CrawlModule/AbstractMenuView.qml - - languages/de.qm - languages/en.qm - languages/es.qm - languages/fr.qm - languages/ja.qm - languages/pl.qm - languages/ru.qm - languages/tr.qm - languages/zh.qm - languages/uk.qm - - - - diff --git a/src/Core/Crawl/clientapp.cpp b/src/Core/Crawl/clientapp.cpp index 538c82c..77d11d7 100644 --- a/src/Core/Crawl/clientapp.cpp +++ b/src/Core/Crawl/clientapp.cpp @@ -54,21 +54,6 @@ ClientApp::~ClientApp() { _availableLvls.clear(); } -void ClientApp::initLang() { - QLocale locale = QLocale::system(); - QString customLanguage = QuasarAppUtils::Params::getArg("lang"); - if(customLanguage.size()) { - locale = QLocale(customLanguage); - } - - if(!QuasarAppUtils::Locales::init(locale, {":/languages/languages/", - ":/credits_languages/", - ":/qmlNotify_languages/", - ":/lv_languages/"})){ - QuasarAppUtils::Params::log("Error load language : " , QuasarAppUtils::Error); - } -} - IWorld *ClientApp::getLastWorld() { for (const auto &data : qAsConst(_availableLvls)) { if (data.viewModel && data.viewModel->unlocked()) { @@ -120,7 +105,6 @@ bool ClientApp::init(QQmlApplicationEngine *engine) { "Error: only enums"); initCrawlResources(); - initLang(); engine->addImportPath(":/CrawlModule/"); diff --git a/src/Core/Crawl/clientapp.h b/src/Core/Crawl/clientapp.h index 95a07b8..184e7ab 100644 --- a/src/Core/Crawl/clientapp.h +++ b/src/Core/Crawl/clientapp.h @@ -67,7 +67,6 @@ public: private: QByteArray initTheme(); - void initLang(); IWorld* getLastWorld(); /**