cmake: Load lang from source tree or install location

LazyT · Dec 20, 2018 · 115ade8 · 115ade8
1 parent 749d8f3
commit 115ade8
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -114,5 +114,4 @@ install(TARGETS
             ${CMAKE_INSTALL_BINDIR}
         COMPONENT ${PROJECT_NAME})
 
-add_subdirectory(lng)
 add_subdirectory(res)
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -1,4 +1,5 @@
 #include "mainwindow.h"
+#include "config.h"
 
 int main(int argc, char *argv[])
 {
@@ -17,15 +18,25 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 
 	if(!QLocale::system().name().startsWith("en_"))
 	{
-		if(appTranslator.load("rrcc_" + QLocale::system().name(), QApplication::applicationDirPath() + "/lng"))
+		QString resource_dir;
+
+		resource_dir = QString::fromUtf8(RRCC_INSOURCE_RESOURCE_DIR);
+		if (!QDir(resource_dir).exists()) {
+			resource_dir = QString::fromUtf8(RRCC_INSTALL_RESOURCE_DIR);
+			if (!QDir(resource_dir).exists()) {
+				resource_dir = QApplication::applicationDirPath();
+			}
+		}
+
+		if(appTranslator.load("rrcc_" + QLocale::system().name(), resource_dir + "/lang"))
 		{
 			QApplication::installTranslator(&appTranslator);
 
 			if(baseTranslator.load("qtbase_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
 			{
 				QApplication::installTranslator(&baseTranslator);
 			}
-			else if(baseTranslator.load("qtbase_" + QLocale::system().name(), QApplication::applicationDirPath() + "/lng"))
+			else if(baseTranslator.load("qtbase_" + QLocale::system().name(), resource_dir + "/lang"))
 			{
 				QApplication::installTranslator(&baseTranslator);
 			}
@@ -34,7 +45,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 			{
 				QApplication::installTranslator(&helpTranslator);
 			}
-			else if(helpTranslator.load("qt_help_" + QLocale::system().name(), QApplication::applicationDirPath() + "/lng"))
+			else if(helpTranslator.load("qt_help_" + QLocale::system().name(), resource_dir + "/lang"))
 			{
 				QApplication::installTranslator(&helpTranslator);
 			}

diff --git a/lng/CMakeLists.txt → res/lang/CMakeLists.txt b/lng/CMakeLists.txt → res/lang/CMakeLists.txt
diff --git a/lng/rrcc_de.qm → res/lang/rrcc_de.qm b/lng/rrcc_de.qm → res/lang/rrcc_de.qm
diff --git a/lng/rrcc_de.ts → res/lang/rrcc_de.ts b/lng/rrcc_de.ts → res/lang/rrcc_de.ts
diff --git a/rrcc.pro b/rrcc.pro
@@ -27,7 +27,7 @@ LIBS        += -lssh
 FORMS       += res/ui/mainwindow.ui res/ui/history.ui res/ui/timer.ui res/ui/setup.ui res/ui/logger.ui res/ui/upload.ui res/ui/packager.ui res/ui/unpackager.ui res/ui/converter.ui res/ui/about.ui res/ui/zones.ui res/ui/installer.ui res/ui/uninstaller.ui res/ui/update.ui res/ui/download.ui
 RESOURCES   += res/rrcc.qrc
 
-TRANSLATIONS+= lng/rrcc_de.ts
+TRANSLATIONS+= res/lang/rrcc_de.ts
 
 unix:!macx {
 QMAKE_LFLAGS+= -Wl,-rpath=.