This commit was manufactured by cvs2git to create branch 'AVIDEMUX_2_5_2'.

[packages/avidemux.git] / qtlocale.patch

--- avidemux_2.5.0/cmake/Ts.cmake.qtlocale	2008-03-11 19:21:46.000000000 +0100
+++ avidemux_2.5.0/cmake/Ts.cmake	2009-07-18 19:44:50.000000000 +0200
@@ -64,7 +64,7 @@
                 
             SET(qm_files ${qm_files} ${_outXml} ${_out})
 
-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
         ENDFOREACH(ts_input ${ts_files})
 
         SET(${_sources} ${${_sources}} ${qm_files})
@@ -95,7 +95,7 @@
                 
             SET(qm_files ${qm_files} ${_out})
 
-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
         ENDFOREACH(ts_input ${ts_files})
 
         SET(${_sources} ${${_sources}} ${qm_files})
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp.qtlocale	2008-10-01 15:49:39.000000000 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2009-07-18 19:51:36.000000000 +0200
@@ -9,6 +9,7 @@
 #include <Carbon/Carbon.h>
 #endif
 #include <QtGui/QPaintEngine>
+//#include "../../config.h"  // for ADMLOCALE with CMake
 
 #include "ADM_inttype.h"
 #include "ADM_files.h"
@@ -73,7 +74,8 @@
 #ifdef __APPLE__
 	QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
 #else
-	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
+//	QString appdir = ADMLOCALE;
+	QString appdir = "/usr/share/avidemux/i18n/";
 #endif
 
 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
@@ -164,4 +165,4 @@
 	}
 
 	return "Qt";
-}
\ No newline at end of file
+}