From 689ef1254bf4a02bbeae49c3c8eec9833f76ea9f Mon Sep 17 00:00:00 2001
From: Klaas Freitag <freitag@owncloud.com>
Date: Mon, 18 Jun 2012 15:52:56 +0200
Subject: [PATCH] MacOS: Move translations to the right place

---
 src/CMakeLists.txt         | 2 +-
 src/mirall/application.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e5cd3cd844..3839ff2a14 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -156,7 +156,7 @@ else()
 
     #FIXME: hardcoded path
     install(FILES /usr/local/lib/csync-0/csync_owncloud.so DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Plugins)
-    install(FILES ${mirall_I18N} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/MacOS)
+    install(FILES ${mirall_I18N} DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/translations)
 
     list(APPEND dirs "/usr/local/lib")
 endif()
diff --git a/src/mirall/application.cpp b/src/mirall/application.cpp
index 2ad796d5b3..b982313f5f 100644
--- a/src/mirall/application.cpp
+++ b/src/mirall/application.cpp
@@ -100,7 +100,7 @@ Application::Application(int &argc, char **argv) :
     mirallTranslator->load("mirall_" + QLocale::system().name(), QLatin1String("/usr/share/mirall/i18n/"));
 #endif
 #ifdef Q_OS_MAC
-    mirallTranslator->load("mirall_" + QLocale::system().name(), applicationDirPath()+QLatin1String("/translations") ); // path defaults to app dir.
+    mirallTranslator->load("mirall_" + QLocale::system().name(), applicationDirPath()+QLatin1String("/../translations") ); // path defaults to app dir.
 #endif
 #ifdef Q_QS_WIN32
     mirallTranslator->load("mirall_" + QLocale::system().name()); // path defaults to app dir.