From c7131e3a1d8379d401fef69d8abed65caa7cdff9 Mon Sep 17 00:00:00 2001
From: Max-Wilhelm Bruker <brukie@gmx.net>
Date: Wed, 27 Jun 2012 20:41:42 +0200
Subject: [PATCH] Windows client: translation path fix

---
 cockatrice/CMakeLists.txt |  6 ------
 cockatrice/src/main.cpp   | 13 +++++++++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index d81bb0c4..c4d38cf0 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -160,12 +160,6 @@ SET(cockatrice_HEADERS
 if (UNIX)
 	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"${CMAKE_INSTALL_PREFIX}/share/cockatrice/translations\\")
 endif (UNIX)
-if (WIN32)
-	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"translations\\")
-endif (WIN32)
-if (APPLE)
-	set_source_files_properties(src/main.cpp PROPERTIES COMPILE_FLAGS -DTRANSLATION_PATH=\\"../../../translations\\")
-endif (APPLE)
 
 set(cockatrice_RESOURCES cockatrice.qrc)
 set(cockatrice_TS
diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp
index 6efaf5db..90c743d5 100644
--- a/cockatrice/src/main.cpp
+++ b/cockatrice/src/main.cpp
@@ -69,8 +69,6 @@ void installNewTranslator()
 
 	qtTranslator->load("qt_" + lang, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 	qApp->installTranslator(qtTranslator);
-	if (!translationPath.startsWith("/"))
-		translationPath.prepend(qApp->applicationDirPath() + "/");
 	translator->load(translationPrefix + "_" + lang, translationPath);
 	qApp->installTranslator(translator);
 }
@@ -99,6 +97,17 @@ int main(int argc, char *argv[])
 	QCoreApplication::setOrganizationDomain("cockatrice.de");
 	QCoreApplication::setApplicationName("Cockatrice");
 	
+	if (translationPath.isEmpty()) {
+#ifdef Q_OS_MAC
+		QDir translationsDir = baseDir;
+		translationsDir.cd("translations");
+		translationPath = translationsDir.absolutePath();
+#endif
+#ifdef Q_OS_WIN
+		translationPath = app.applicationDirPath() + "/translations";
+#endif
+	}
+	
 	rng = new RNG_SFMT;
 	settingsCache = new SettingsCache;
 	db = new CardDatabase;