From 8497f07dea494d566186ddc106236b942400d1c8 Mon Sep 17 00:00:00 2001 From: Leonardo Zide Date: Sat, 16 Mar 2019 16:18:10 -0700 Subject: [PATCH] Load Qt translation files from the app folder. --- qt/qtmain.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/qt/qtmain.cpp b/qt/qtmain.cpp index 9d015781..2e126356 100644 --- a/qt/qtmain.cpp +++ b/qt/qtmain.cpp @@ -127,21 +127,23 @@ int main(int argc, char *argv[]) QTranslator QtTranslator; if (QtTranslator.load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) - { Application.installTranslator(&QtTranslator); - } +#ifdef Q_OS_WIN + else if (QtTranslator.load(QLocale::system(), "qt", "_", qApp->applicationDirPath() + "/translations")) + Application.installTranslator(&QtTranslator); +#endif QTranslator QtBaseTranslator; if (QtBaseTranslator.load("qtbase_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) - { Application.installTranslator(&QtBaseTranslator); - } +#ifdef Q_OS_WIN + else if (QtBaseTranslator.load("qtbase_" + QLocale::system().name(), qApp->applicationDirPath() + "/translations")) + Application.installTranslator(&QtBaseTranslator); +#endif QTranslator Translator; if (Translator.load("leocad_" + QLocale::system().name(), ":/resources")) - { Application.installTranslator(&Translator); - } qRegisterMetaTypeStreamOperators >("QList");