[vlc-devel] commit: Qt: Remove the use of the Qt translations (Jean-Baptiste Kempf )
git version control
git at videolan.org
Thu Oct 1 22:19:13 CEST 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 1 19:18:38 2009 +0200| [763530cc79e78f6236613082dda138dae73f96c2] | committer: Jean-Baptiste Kempf
Qt: Remove the use of the Qt translations
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=763530cc79e78f6236613082dda138dae73f96c2
---
modules/gui/qt4/qt4.cpp | 28 ----------------------------
1 files changed, 0 insertions(+), 28 deletions(-)
diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 89388a5..5c298df 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -422,33 +422,6 @@ static void *Thread( void *obj )
/* Explain to the core how to show a dialog :D */
p_intf->pf_show_dialog = ShowDialog;
-#ifdef ENABLE_NLS
- // Translation - get locale
-# if defined (WIN32) || defined (__APPLE__)
- char* psz_tmp = config_GetPsz( p_intf, "language" );
- QString lang = qfu( psz_tmp );
- free( psz_tmp);
- if (lang == "auto")
- lang = QLocale::system().name();
-# else
- QString lang = QLocale::system().name();
-# endif
- // Translations for qt's own dialogs
- QTranslator qtTranslator( 0 );
- // Let's find the right path for the translation file
-#if !defined( WIN32 )
- QString path = QString( QT4LOCALEDIR );
-#else
- QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
- "locale" + DIR_SEP + "qt4" + DIR_SEP );
-#endif
- // files depending on locale
- bool b_loaded = qtTranslator.load( path + "qt_" + lang );
- if (!b_loaded)
- msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
- app.installTranslator( &qtTranslator );
-#endif //ENABLE_NLS
-
/* Last settings */
app.setQuitOnLastWindowClosed( false );
@@ -461,7 +434,6 @@ static void *Thread( void *obj )
if( s_style.compare("") != 0 )
QApplication::setStyle( s_style );
-
/* Launch */
app.exec();
More information about the vlc-devel
mailing list