[QGIS Commit] r10815 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: borysiasty
Date: 2009-05-18 07:15:47 -0400 (Mon, 18 May 2009)
New Revision: 10815

Modified:
   trunk/qgis/src/app/qgsoptions.cpp
Log:
The locale selector fixes

Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2009-05-18 10:02:31 UTC (rev 10814)
+++ trunk/qgis/src/app/qgsoptions.cpp	2009-05-18 11:15:47 UTC (rev 10815)
@@ -176,7 +176,7 @@
   cboLocale->addItems( myI18nList );
   if ( myI18nList.contains( myUserLocale ) )
   {
-    cboLocale->setItemText( cboLocale->currentIndex(), myUserLocale );
+    cboLocale->setCurrentIndex( myI18nList.indexOf( myUserLocale ) );
   }
   bool myLocaleOverrideFlag = settings.value( "locale/overrideFlag", false ).toBool();
   grpLocale->setChecked( myLocaleOverrideFlag );
@@ -623,7 +623,7 @@
   QStringList myList;
   myList << "en_US"; //there is no qm file for this so we add it manually
   QString myI18nPath = QgsApplication::i18nPath();
-  QDir myDir( myI18nPath, "*.qm" );
+  QDir myDir( myI18nPath, "qgis*.qm" );
   QStringList myFileList = myDir.entryList();
   QStringListIterator myIterator( myFileList );
   while ( myIterator.hasNext() )