Fix translation generation on Linux.

Author: till213

Distribution.pri

@@ -11,11 +11,13 @@ linux {
 installer.depends = distribution
 
 # Remove previous bundle
-i18n.commands += test -d dist && rm -rf dist;
+i18n.commands += test -d $${DIST_DIR} && rm -rf $${DIST_DIR};
 i18n.commands += mkdir dist;
 i18n.commands += mkdir $${DIST_DIR}/translations;
 i18n.commands += lrelease \"$$PWD/src/translations/screenie_de.ts\" -qm $${DIST_DIR}/translations/screenie_de.qm;
-i18n.commands += cp $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm $${DIST_DIR}/translations/qtbase_de.qm
+!linux {
+  i18n.commands += test -f $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm && cp $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm $${DIST_DIR}/translations/qtbase_de.qm;
+}
 i18n.depends = all
 
 distribution.depends  = i18n

Distribution_Linux.pri

@@ -0,0 +1,20 @@
+include (src/Common.pri)
+
+CONFIG(debug, debug|release) {
+    BIN_DIR = ./bin/debug
+    message(Distributing $$APP_NAME in DEBUG mode)
+} else {
+    BIN_DIR = ./bin/release
+    message(Distributing $$APP_NAME in RELEASE mode)
+}
+
+DIST_DIR = ./dist
+
+#
+# Distribution
+#
+
+distribution.commands += @echo Making distribution for Linux;
+
+# Copy compiled binaries
+distribution.commands += cp -R $${BIN_DIR}/* ./$${DIST_DIR};

src/Screenie/src/Main.cpp

@@ -40,22 +40,34 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationVersion(Version::getApplicationVersion());
 
     qRegisterMetaType<ScreenieModelInterface::ReflectionMode>();
-
 #ifdef Q_OS_WIN
     // On Windows prefer INI format over Registry (= NativeFormat)
     QSettings::setDefaultFormat(QSettings::IniFormat);
 #endif
 
     ScreenieApplication app(argc, argv);
+#ifdef Q_OS_WIN
+    QString appTranslationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+#elif defined Q_OS_LINUX
+    QString appTranslationPath = QCoreApplication::applicationDirPath() + "/translations";
+#elif defined Q_OS_MAC
+    QString appTranslationPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
+#else
+    QString appTranslationPath = QCoreApplication::applicationDirPath() + "/translations";
+#endif
 
     QTranslator qtTranslator;
     qtTranslator.load(QLocale::system(), "qtbase", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     app.installTranslator(&qtTranslator);
 
     QTranslator appTranslator;
-    appTranslator.load(QLocale::system(), "screenie", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    appTranslator.load(QLocale::system(), "screenie", "_", appTranslationPath);
     app.installTranslator(&appTranslator);
 
+#ifdef DEBUG
+    qDebug("System LOCALE: %s, app translation path: %s, Qt translation path: %s", qPrintable(QLocale::system().name()), qPrintable(appTranslationPath), qPrintable(QLibraryInfo::location(QLibraryInfo::TranslationsPath)));
+#endif
+
 #ifdef Q_OS_MAC
     QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif