From 72d0e9e6e0b17cdd759c9a9f45d57ce301ade6f9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 5 May 2019 18:37:24 +0200 Subject: [PATCH] Adapt search path for translations to new config system --- cmake/modules/QtConfig.cmake | 2 +- resources/resources.cpp | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/modules/QtConfig.cmake b/cmake/modules/QtConfig.cmake index 0f977f4..bf844b4 100644 --- a/cmake/modules/QtConfig.cmake +++ b/cmake/modules/QtConfig.cmake @@ -244,7 +244,7 @@ if (ENABLE_QT_TRANSLATIONS AND TS_FILES) endif () endif () - list(APPEND APP_SPECIFIC_QT_TRANSLATION_FILES "${META_PROJECT_NAME}") + list(APPEND APP_SPECIFIC_QT_TRANSLATION_FILES "${META_PROJECT_NAME}${META_CONFIG_SUFFIX}") endif () # make application specific translation available as array via config.h (even if this project has no translations, there diff --git a/resources/resources.cpp b/resources/resources.cpp index ad434d9..fee3b8b 100644 --- a/resources/resources.cpp +++ b/resources/resources.cpp @@ -189,10 +189,9 @@ void loadApplicationTranslationFile(const QString &applicationName, const QStrin QCoreApplication::installTranslator(appTranslator); } else if (appTranslator->load(fileName, QStringLiteral("./translations"))) { QCoreApplication::installTranslator(appTranslator); - } else if (appTranslator->load( - fileName, QStringLiteral(APP_INSTALL_PREFIX "/" APP_DATA_DIR) % applicationName % QStringLiteral("/translations"))) { + } else if (appTranslator->load(fileName, QStringLiteral(APP_INSTALL_PREFIX "/share/") % applicationName % QStringLiteral("/translations"))) { QCoreApplication::installTranslator(appTranslator); - } else if (appTranslator->load(fileName, QStringLiteral("../" APP_DATA_DIR "/") % applicationName % QStringLiteral("/translations"))) { + } else if (appTranslator->load(fileName, QStringLiteral("../share/") % applicationName % QStringLiteral("/translations"))) { QCoreApplication::installTranslator(appTranslator); } else if (appTranslator->load(fileName, QStringLiteral(":/translations"))) { QCoreApplication::installTranslator(appTranslator);