equal
deleted
inserted
replaced
463 QSettings settings(cfgdir->absolutePath() + "/hedgewars.ini", QSettings::IniFormat); |
463 QSettings settings(cfgdir->absolutePath() + "/hedgewars.ini", QSettings::IniFormat); |
464 QString cc = settings.value("misc/locale", QString()).toString(); |
464 QString cc = settings.value("misc/locale", QString()).toString(); |
465 if(cc.isEmpty()) |
465 if(cc.isEmpty()) |
466 cc = QLocale::system().name(); |
466 cc = QLocale::system().name(); |
467 QFile tmpfile; |
467 QFile tmpfile; |
468 tmpfile.setFileName(cfgdir->absolutePath() + "Data/Locale/hedgewars_" + cc); |
468 tmpfile.setFileName(cfgdir->absolutePath() + "/Data/Locale/hedgewars_" + cc); |
469 if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "Locale/hedgewars_" + cc); |
469 if (!tmpfile.exists()) tmpfile.setFileName(datadir->absolutePath() + "/Locale/hedgewars_" + cc); |
470 Translator.load(QFileInfo(tmpfile).absoluteFilePath()); |
470 Translator.load(QFileInfo(tmpfile).absoluteFilePath()); |
471 app.installTranslator(&Translator); |
471 app.installTranslator(&Translator); |
472 } |
472 } |
473 |
473 |
474 // Win32 registry setup (used for xfire detection etc. - don't set it if we're running in "portable" mode with a custom config dir) |
474 // Win32 registry setup (used for xfire detection etc. - don't set it if we're running in "portable" mode with a custom config dir) |