diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 576b9101..3bfa7b7c 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -165,7 +165,18 @@ macx { HelpFiles.path = Contents/Resources/Help QMAKE_BUNDLE_DATA += HelpFiles } + + QtTransFiles.files = $$files($$[QT_INSTALL_TRANSLATIONS]/qt*.qm) + QtTransFiles.path = Contents/translations + QMAKE_BUNDLE_DATA += QtTransFiles + + TransFiles.files = $$files($$PWD/translations/*.qm) + TransFiles.path = Contents/Resources/translations QMAKE_BUNDLE_DATA += TransFiles + + HtmlFiles.files = $${HTML_FILES} + HtmlFiles.path = Contents/Resources/html + QMAKE_BUNDLE_DATA += HtmlFiles } else { !contains(DEFINES, helpless) { HELPDIR = $$OUT_PWD/Help diff --git a/oscar/translation.cpp b/oscar/translation.cpp index d8cb45c3..6779a1d3 100644 --- a/oscar/translation.cpp +++ b/oscar/translation.cpp @@ -1,5 +1,6 @@ -/* Multilingual Support files +/* Multilingual Support files * + * Copyright (c) 2019 The OSCAR Team * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public @@ -176,11 +177,12 @@ void initTranslations() QString qtLang = language.left(2); if ( qtLang.compare("zh") == 0 ) qtLang.append("_CN"); - qDebug() << "Loading" << langname << "QT translation" << "qt_" + qtLang + ".qm" << "from" << qtLangPath.toLocal8Bit().data(); + QString qtLangFile = "qt_" + qtLang + ".qm"; + qDebug() << "Loading" << langname << "QT translation" << qtLangFile.toLocal8Bit().data() << "from" << qtLangPath.toLocal8Bit().data(); QTranslator * qtranslator = new QTranslator(); - if (!langfile.isEmpty() && !qtranslator->load("qt_" + qtLang + ".qm", qtLangPath)) { - qWarning() << "Could not load QT translation" << langfile << "reverting to english :("; + if (!qtLangFile.isEmpty() && !qtranslator->load(qtLangFile, qtLangPath)) { + qWarning() << "Could not load QT translation" << qtLangFile << "reverting to english :("; } qApp->installTranslator(qtranslator);