mac fixes

This commit is contained in:
Max-Wilhelm Bruker 2012-04-27 00:39:34 +02:00
parent 61f5cd478d
commit 875610e1b3
4 changed files with 15 additions and 9 deletions

View file

@ -49,9 +49,9 @@ SoundEngine *soundEngine;
const QString translationPrefix = "cockatrice";
#ifdef TRANSLATION_PATH
const QString translationPath = TRANSLATION_PATH;
QString translationPath = TRANSLATION_PATH;
#else
const QString translationPath = QString();
QString translationPath = QString();
#endif
void myMessageOutput(QtMsgType /*type*/, const char *msg)
@ -69,7 +69,8 @@ void installNewTranslator()
qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
qApp->installTranslator(qtTranslator);
if (!translationPath.startsWith("/"))
translationPath.prepend(qApp->applicationDirPath() + "/");
if (!settingsCache->getCustomTranslationFile().isEmpty())
translator->load(settingsCache->getCustomTranslationFile());
else