diff --git a/Deploy/extracter.cpp b/Deploy/extracter.cpp index 664cacc..ea61103 100644 --- a/Deploy/extracter.cpp +++ b/Deploy/extracter.cpp @@ -269,8 +269,22 @@ bool Extracter::copyTr() { const auto trFiles = i->tr(); for (const auto &tr: trFiles) { - if (!_fileManager->copyFile(tr, cnf->getPackageTargetDir(i.key()) + i->getTrOutDir())) { - return false; + + QFileInfo info(tr); + + if (info.isDir()) { + QDir dir(info.absoluteFilePath()); + auto availableQm = dir.entryInfoList({"*.qm"}, QDir::Files); + for (const auto & trFile : qAsConst(availableQm)) { + if (!_fileManager->copyFile(trFile.absoluteFilePath(), + cnf->getPackageTargetDir(i.key()) + i->getTrOutDir())) { + return false; + } + } + } else { + if (!_fileManager->copyFile(tr, cnf->getPackageTargetDir(i.key()) + i->getTrOutDir())) { + return false; + } } } } diff --git a/UnitTests/tst_deploytest.cpp b/UnitTests/tst_deploytest.cpp index dd93189..ee6ea86 100644 --- a/UnitTests/tst_deploytest.cpp +++ b/UnitTests/tst_deploytest.cpp @@ -1190,21 +1190,22 @@ void deploytest::testDeployGeneralFiles() { void deploytest::testTr() { TestUtils utils; #ifdef Q_OS_UNIX - QString bin = TestBinDir + "QtWidgetsProject"; - QString qmake = TestQtDir + "bin/qmake"; + QString bin = TestBinDir + "TestOnlyC"; #else - QString bin = TestBinDir + "QtWidgetsProject.exe"; - QString qmake = TestQtDir + "bin/qmake.exe"; + QString bin = TestBinDir + "TestOnlyC.exe"; #endif - auto comapareTree = TestModule.qtLibs(); - - comapareTree += utils.createTree({"./" + DISTRO_DIR + "/translations/TestTr.qm"}); runTestParams({"-bin", bin, "clear" , - "-tr", ":/testResurces/testRes/TestTr.qm", - "-qmake", qmake}, &comapareTree); + "-tr", ":/testResurces/testRes/TestTr.qm",}); + + QVERIFY(QFile::exists("./" + DISTRO_DIR + "/translations/TestTr.qm")); + + runTestParams({"-bin", bin, "clear" , + "-tr", ":/testResurces/testRes/"}); + + QVERIFY(QFile::exists("./" + DISTRO_DIR + "/translations/TestTr.qm")); } void deploytest::testVirtualKeyBoard() {