From 1a74e9c1fe7f8969943e9ee31dfee46857915846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Wed, 17 Aug 2016 18:25:00 +0200 Subject: [PATCH] update translation install path --- libguh/plugin/deviceplugin.cpp | 2 +- plugins/plugins.pri | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libguh/plugin/deviceplugin.cpp b/libguh/plugin/deviceplugin.cpp index 9832b7cc..4f2121e2 100644 --- a/libguh/plugin/deviceplugin.cpp +++ b/libguh/plugin/deviceplugin.cpp @@ -451,7 +451,7 @@ QTranslator *DevicePlugin::translator() bool DevicePlugin::setLocale(const QLocale &locale) { // check if there are local translations - if (m_translator->load(locale, m_metaData.value("id").toString(), "-", QDir(QCoreApplication::applicationDirPath() + "../../translations/").absolutePath(), ".qm")) { + if (m_translator->load(locale, m_metaData.value("id").toString(), "-", QDir(QCoreApplication::applicationDirPath() + "../../plugins/translations/").absolutePath(), ".qm")) { qCDebug(dcDeviceManager()) << "* Load translation" << locale.name() << "for" << pluginName() << "from" << QDir(QCoreApplication::applicationDirPath() + "../../translations/").absolutePath(); return true; } diff --git a/plugins/plugins.pri b/plugins/plugins.pri index a35bd6d6..2b423bdb 100644 --- a/plugins/plugins.pri +++ b/plugins/plugins.pri @@ -23,9 +23,10 @@ infofile.commands = $$top_srcdir/plugins/guh-generateplugininfo -j ${QMAKE_FILE_ -o ${QMAKE_FILE_OUT} \ -b $$OUT_PWD \ -t $$TRANSLATIONS; \ - rsync -a "$$OUT_PWD"/translations/*.qm $$top_builddir/translations/; + rsync -a "$$OUT_PWD"/translations/*.qm $$top_builddir/plugins/translations/; QMAKE_EXTRA_COMPILERS += infofile +PRE_TARGETDEPS += compiler_infofile_make_all # Install translation files translations.path = /usr/share/guh/translations