Attachment 3441 Details for Bug 19586 – avidemux_2.4.4-alt-i18n-qm-path.patch

[patch] avidemux_2.4.4-alt-i18n-qm-path.patch

avidemux_2.4.4-alt-i18n-qm-path.patch (text/plain), 1.30 KB, created by Zerg on 2009-04-12 15:04:40 MSD

(hide)

Description:

Filename:

MIME Type:

Creator: Zerg

Created: 2009-04-12 15:04:40 MSD

Size: 1.30 KB

patch

obsolete

>--- avidemux_2.4.4/cmake/Ts.cmake~	2007-10-14 15:58:28 +0400
>+++ avidemux_2.4.4/cmake/Ts.cmake	2009-04-12 03:08:09 +0400
>@@ -63,7 +63,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdi
>                 
>             SET(qm_files ${qm_files} ${_outXml} ${_out})
> 
>-			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
>+			INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/qt4/translations")
>         ENDFOREACH(ts_input ${ts_files})
> 
>         SET(${_sources} ${${_sources}} ${qm_files})
>--- avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp~	2008-09-24 05:09:49 +0400
>+++ avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2009-04-12 03:12:19 +0400
>@@ -3,6 +3,7 @@
> #include <QApplication>
> #include <QtCore>
> #include <QtGui>
>+#include <QLibraryInfo>
> 
> #include "default.h"
> 
>@@ -60,7 +61,7 @@ void loadTranslator(void)
> {
> 	printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
> 
>-	QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
>+	QString appdir = QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QDir::separator();
> 
> 	loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
> 	loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());

Actions: View | Diff

Attachments on bug 19586: 3438 | 3439 | 3440 | 3441