[yast-commit] r62121 - in /branches/SuSE-Code-11-Branch/qt: VERSION.cmake package/yast2-qt.changes src/YQApplication.cc
Author: tgoettlicher Date: Thu Jun 17 14:24:16 2010 New Revision: 62121 URL: http://svn.opensuse.org/viewcvs/yast?rev=62121&view=rev Log: - Fixed left hand to right hand changing (bnc #612030) - V 2.17.28 Modified: branches/SuSE-Code-11-Branch/qt/VERSION.cmake branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-Branch/qt/src/YQApplication.cc Modified: branches/SuSE-Code-11-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/VERSION.cmake?rev=62121&r1=62120&r2=62121&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-Branch/qt/VERSION.cmake Thu Jun 17 14:24:16 2010 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "27") +SET(VERSION_PATCH "28") Modified: branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes?rev=62121&r1=62120&r2=62121&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-Branch/qt/package/yast2-qt.changes Thu Jun 17 14:24:16 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 17 13:27:20 CEST 2010 - tgoettlicher@suse.de + +- Fixed left hand to right hand changing (bnc #612030) +- V 2.17.28 + +------------------------------------------------------------------- Tue Jan 13 17:03:58 CET 2009 - tgoettlicher@suse.de - Fixed bnc #445951: Help dialog untranslated Modified: branches/SuSE-Code-11-Branch/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/qt/src/YQApplication.cc?rev=62121&r1=62120&r2=62121&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/qt/src/YQApplication.cc (original) +++ branches/SuSE-Code-11-Branch/qt/src/YQApplication.cc Thu Jun 17 14:24:16 2010 @@ -42,7 +42,6 @@ #include "YQApplication.h" #include "YQPackageSelectorPluginStub.h" - YQApplication::YQApplication() : YApplication() , _currentFont( 0 ) @@ -73,11 +72,13 @@ deleteFonts(); } +static string glob_language = ""; void YQApplication::setLanguage( const string & language, const string & encoding ) { + glob_language = language; YApplication::setLanguage( language, encoding ); loadPredefinedQtTranslations(); @@ -99,10 +100,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.toLower().replace('_','-') ); + QString transFile = QString( "qt_%1.qm").arg( language ); + + 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
participants (1)
-
tgoettlicher@svn.opensuse.org