jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-14 10:04:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

moved translations out of resources file

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2012-04-22 18:14:17 +02:00
parent b26444435c
commit 089d082cf4
5 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/dlg_settings.cpp
View file

@ -104,7 +104,7 @@ GeneralSettingsPage::GeneralSettingsPage()
QStringList GeneralSettingsPage::findQmFiles()
{
QDir dir(":/translations");
QDir dir(translationPath);
QStringList fileNames = dir.entryList(QStringList(translationPrefix + "_*.qm"), QDir::Files, QDir::Name);
fileNames.replaceInStrings(QRegExp(translationPrefix + "_(.*)\\.qm"), "\\1");
return fileNames;
@ -113,7 +113,7 @@ QStringList GeneralSettingsPage::findQmFiles()
QString GeneralSettingsPage::languageName(const QString &qmFile)
{
QTranslator translator;
translator.load(":/translations/" + translationPrefix + "_" + qmFile + ".qm");
translator.load(translationPrefix + "_" + qmFile + ".qm", translationPath);
return translator.translate("GeneralSettingsPage", "English");
}

9
cockatrice/src/main.cpp
View file

@ -47,6 +47,13 @@ SettingsCache *settingsCache;
RNG_Abstract *rng;
SoundEngine *soundEngine;
const QString translationPrefix = "cockatrice";
#ifdef TRANSLATION_PATH
const QString translationPath = TRANSLATION_PATH;
#else
const QString translationPath = QString();
#endif
void myMessageOutput(QtMsgType /*type*/, const char *msg)
{
static FILE *f = NULL;
@ -66,7 +73,7 @@ void installNewTranslator()
if (!settingsCache->getCustomTranslationFile().isEmpty())
translator->load(settingsCache->getCustomTranslationFile());
else
translator->load(translationPrefix + "_" + lang, ":/translations");
translator->load(translationPrefix + "_" + lang, translationPath);
qApp->installTranslator(translator);
}

3
cockatrice/src/main.h
View file

@ -8,7 +8,8 @@ class SoundEngine;
extern CardDatabase *db;
extern QTranslator *translator;
const QString translationPrefix = "cockatrice";
extern const QString translationPrefix;
extern const QString translationPath;
void installNewTranslator();