jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Translation code fix; updated German translation

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-09-10 19:12:01 +02:00
parent e09060faca
commit 5ee6bdd338
5 changed files with 743 additions and 679 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cockatrice/src/main.cpp
View file

@ -39,7 +39,7 @@
//Q_IMPORT_PLUGIN(qjpeg)
CardDatabase *db;
QTranslator *translator;
QTranslator *translator, *qtTranslator;
SettingsCache *settingsCache;
PingPixmapGenerator *pingPixmapGenerator;
@ -52,6 +52,17 @@ void myMessageOutput(QtMsgType /*type*/, const char *msg)
fflush(f);
}
void installNewTranslator()
{
QString lang = settingsCache->getLang();
qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
qApp->installTranslator(qtTranslator);
translator->load(translationPrefix + "_" + lang, ":/translations");
qApp->installTranslator(translator);
}
int main(int argc, char *argv[])
{
// qInstallMsgHandler(myMessageOutput);
@ -78,18 +89,9 @@ int main(int argc, char *argv[])
db = new CardDatabase;
pingPixmapGenerator = new PingPixmapGenerator;
QString localeName;// = QLocale::system().name();
QTranslator qtTranslator;
qtTranslator.load("qt_" + localeName, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
app.installTranslator(&qtTranslator);
qtTranslator = new QTranslator;
translator = new QTranslator;
QString lang = settingsCache->getLang();
if (lang.isEmpty())
translator->load("cockatrice_" + localeName, ":/translations", QString(), ".qm");
else
translator->load(lang);
app.installTranslator(translator);
installNewTranslator();
qsrand(QDateTime::currentDateTime().toTime_t());