[yast-commit] r62120 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQApplication.cc

Author: tgoettlicher Date: Thu Jun 17 10:45:30 2010 New Revision: 62120 URL: http://svn.opensuse.org/viewcvs/yast?rev=62120&view=rev Log: - Fixed left hand to right hand changing (bnc #612030) - V 2.19.2 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQApplication.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=62120&r1=62119&r2=62120&view=diff ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Thu Jun 17 10:45:30 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "19") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "2") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=62120&r1=62119&r2=62120&view=diff ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Thu Jun 17 10:45:30 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 17 10:43:05 CEST 2010 - tgoettlicher@suse.de + +- Fixed left hand to right hand changing (bnc #612030) +- V 2.19.2 + +------------------------------------------------------------------- Tue Apr 20 14:36:13 CEST 2010 - tgoettlicher@suse.de - increased version number Modified: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=62120&r1=62119&r2=62120&view=diff ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Thu Jun 17 10:45:30 2010 @@ -38,7 +38,6 @@ Textdomain "qt" /-*/ - #include // access() #include <QApplication> @@ -101,11 +100,13 @@ deleteFonts(); } +static string glob_language = ""; void YQApplication::setLanguage( const string & language, const string & encoding ) { + glob_language = language; YApplication::setLanguage( language, encoding ); loadPredefinedQtTranslations(); @@ -127,9 +128,16 @@ YQApplication::loadPredefinedQtTranslations() { QString path = QT_LOCALEDIR; - QString language = QLocale::system().name(); + QString language; + + if (glob_language == "") + language = QLocale::system().name(); + else + language = glob_language.c_str(); + + QString transFile = QString( "qt_%1.qm").arg( language ); - QString transFile = QString( "qt_%1.qm"); + yuiMilestone() << "Selected language: " << language << endl; if ( path.isEmpty() ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org