Martchus
/
qtutilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adapt search path for translations to new config system

This commit is contained in:
Martchus 2019-05-05 18:37:24 +02:00
parent 7642214a11
commit 72d0e9e6e0
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/modules/QtConfig.cmake
View File

@ -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

5
resources/resources.cpp
View File

@ -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);