Adapt search path for translations to new config system
This commit is contained in:
parent
7642214a11
commit
72d0e9e6e0
|
@ -244,7 +244,7 @@ if (ENABLE_QT_TRANSLATIONS AND TS_FILES)
|
||||||
endif ()
|
endif ()
|
||||||
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 ()
|
endif ()
|
||||||
|
|
||||||
# make application specific translation available as array via config.h (even if this project has no translations, there
|
# make application specific translation available as array via config.h (even if this project has no translations, there
|
||||||
|
|
|
@ -189,10 +189,9 @@ void loadApplicationTranslationFile(const QString &applicationName, const QStrin
|
||||||
QCoreApplication::installTranslator(appTranslator);
|
QCoreApplication::installTranslator(appTranslator);
|
||||||
} else if (appTranslator->load(fileName, QStringLiteral("./translations"))) {
|
} else if (appTranslator->load(fileName, QStringLiteral("./translations"))) {
|
||||||
QCoreApplication::installTranslator(appTranslator);
|
QCoreApplication::installTranslator(appTranslator);
|
||||||
} else if (appTranslator->load(
|
} else if (appTranslator->load(fileName, QStringLiteral(APP_INSTALL_PREFIX "/share/") % applicationName % QStringLiteral("/translations"))) {
|
||||||
fileName, QStringLiteral(APP_INSTALL_PREFIX "/" APP_DATA_DIR) % applicationName % QStringLiteral("/translations"))) {
|
|
||||||
QCoreApplication::installTranslator(appTranslator);
|
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);
|
QCoreApplication::installTranslator(appTranslator);
|
||||||
} else if (appTranslator->load(fileName, QStringLiteral(":/translations"))) {
|
} else if (appTranslator->load(fileName, QStringLiteral(":/translations"))) {
|
||||||
QCoreApplication::installTranslator(appTranslator);
|
QCoreApplication::installTranslator(appTranslator);
|
||||||
|
|
Loading…
Reference in New Issue