# # # patch "src/main.cpp" # from [b3c466a5103800420aa2b0cab6c9d1be4994f5c5] # to [60049867487708f7eb18c012c34641041114aec8] # ============================================================ --- src/main.cpp b3c466a5103800420aa2b0cab6c9d1be4994f5c5 +++ src/main.cpp 60049867487708f7eb18c012c34641041114aec8 @@ -23,9 +23,10 @@ #include #include +#include void guitoneMsgHandler(QtMsgType type, const char *msg) -{ +{ switch (type) { case QtDebugMsg: @@ -47,32 +48,33 @@ int main(int argc, char** argv) { // install our own message handler to catch debug messages, warnings, etc. qInstallMsgHandler(guitoneMsgHandler); - + QString locale = QLocale::system().name(); - + // load the default Qt translations QTranslator qtTranslator; - if (!qtTranslator.load("qt_" + locale)) + QString transPath = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + if (!qtTranslator.load("qt_" + locale, transPath)) { W(QString("Couldn't load qt translation for %1 - using default") .arg(locale)); } - + // try to load the application's translation QTranslator appTranslator; QString transFileName("guitone_" + locale); - + if (!appTranslator.load(transFileName, ":/i18n")) { W(QString("Couldn't load app translation for %1 - using default") .arg(locale)); } - + Guitone app(argc, argv); - + app.installTranslator(&appTranslator); app.installTranslator(&qtTranslator); - + return app.exec(); }