From: Christophe Mutricy <xtophe@videolan.org>
Date: Sat, 29 Dec 2007 23:25:52 +0000 (+0000)
Subject: Only do translation in Qt when asked.
X-Git-Tag: 0.9.0-test0~3804
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7910ae7a2d03d6b380f617cd744ba61f9802129f;p=vlc

Only do translation in Qt when asked.
---

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index edf62bd315..3148a9b346 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -283,6 +283,7 @@ static void Init( intf_thread_t *p_intf )
     else
     /*if( p_intf->pf_show_dialog )*/
         vlc_thread_ready( p_intf );
+#ifdef ENABLE_NLS
     // Translation - get locale
     QLocale ql = QLocale::system();
     // Translations for qt's own dialogs
@@ -299,7 +300,7 @@ static void Init( intf_thread_t *p_intf )
     if (!b_loaded)
         msg_Dbg( p_intf, "Error while initializing qt-specific localization" );
     app->installTranslator( &qtTranslator );
-
+#endif  //ENABLE_NLS
     /* Start playing if needed */
     if( !p_intf->pf_show_dialog && p_intf->b_play )
     {