diff --git a/src/Client/CMakeLists.txt b/src/Client/CMakeLists.txt
index 4198022..167328b 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/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/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/Client/main.cpp b/src/Client/main.cpp
index 3da7d5d..24c367c 100644
--- a/src/Client/main.cpp
+++ b/src/Client/main.cpp
@@ -9,9 +9,24 @@
#include
#include
#include
-#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[])
{
@@ -29,5 +44,8 @@ int main(int argc, char *argv[])
if (!client.init(&engine)) {
return 1;
}
+
+ initLang();
+
return app.exec();
}
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)
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();
/**