diff --git a/nymea-app.pro b/nymea-app.pro index 9eae765c..19e4b6ab 100644 --- a/nymea-app.pro +++ b/nymea-app.pro @@ -105,6 +105,9 @@ INSTALLS += ubuntu_files # Translations support TRANSLATIONS += $$files($$absolute_path(nymea-app)/translations/*.ts, true) +!equals(OVERLAY_PATH, "") { + TRANSLATIONS += $$files($${OVERLAY_PATH}/translations/*ts, true) +} system("lrelease $$TRANSLATIONS") lrelease.commands = lrelease $$TRANSLATIONS QMAKE_EXTRA_TARGETS += lrelease diff --git a/nymea-app/main.cpp b/nymea-app/main.cpp index 1fab0399..7f90a934 100644 --- a/nymea-app/main.cpp +++ b/nymea-app/main.cpp @@ -120,6 +120,17 @@ int main(int argc, char *argv[]) } application.installTranslator(&appTranslator); +#ifdef OVERLAY_PATH + QTranslator overlayTranslator; + translationResult = overlayTranslator.load(QString("%1-%2").arg(APPLICATION_NAME).arg(QLocale().name()), ":/translations"); + if (translationResult) { + qCDebug(dcApplication()) << "Loaded overlay translation for locale" << QString("%1-%2").arg(APPLICATION_NAME).arg(QLocale().name()); + } else { + qCInfo(dcApplication()) << "Failed to load overlay translations for locale" << QString("%1-%2").arg(APPLICATION_NAME).arg(QLocale().name()); + } + application.installTranslator(&overlayTranslator); +#endif + registerQmlTypes(); QQmlApplicationEngine *engine = new QQmlApplicationEngine(); @@ -175,7 +186,7 @@ int main(int argc, char *argv[]) qmlRegisterType("Nymea", 1, 0, "ConfiguredHostsProxyModel"); qmlRegisterUncreatableType("Nymea", 1, 0, "ConfiguredHost", "Get them from ConfiguredHostsModel"); -#ifdef OVERLAY_QMLTYPES +#ifdef OVERLAY_PATH registerOverlayTypes("Nymea", 1, 0); #endif diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index c0b83888..9b31d735 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -62,6 +62,7 @@ linux:!android:!ubports: { exists($${OVERLAY_PATH}/src/src.pri) { message("Including sources from overlay") include($${OVERLAY_PATH}/src/src.pri) + DEFINES += OVERLAY_PATH=\\\"$${OVERLAY_PATH}\\\" DEFINES += OVERLAY_QMLTYPES=\\\"$${OVERLAY_PATH}/src/qmltypes.h\\\" } } else {