[QGIS Commit] r12829 - trunk/qgis/src/plugins/grass

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-01-24 10:59:54 -0500 (Sun, 24 Jan 2010)
New Revision: 12829

Modified:
   trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp
   trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
Log:
fix grass string

Modified: trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp	2010-01-23 21:50:09 UTC (rev 12828)
+++ trunk/qgis/src/plugins/grass/qgsgrassplugin.cpp	2010-01-24 15:59:54 UTC (rev 12829)
@@ -311,14 +311,14 @@
       if ( level == 1 ) 
       {
         QgsDebugMsg( "Cannot open vector on level 2" );
-        QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector ") + sel->map + tr(" in mapset ") + sel->mapset + tr (" on level 2 (topology not available, try to rebuild tobopoly using v.build module)." ) );
+        QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module).").arg( sel->map ).arg( sel->mapset ) );
         Vect_close( &map );
         return;
       }
       else if ( level < 1 )
       {
         QgsDebugMsg( "Cannot open vector" );
-        QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector ") + sel->map + tr(" in mapset ") + sel->mapset );
+        QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( sel->map ).arg( sel->mapset ) );
         return;
       }
 

Modified: trunk/qgis/src/plugins/grass/qgsgrassselect.cpp
===================================================================
--- trunk/qgis/src/plugins/grass/qgsgrassselect.cpp	2010-01-23 21:50:09 UTC (rev 12828)
+++ trunk/qgis/src/plugins/grass/qgsgrassselect.cpp	2010-01-24 15:59:54 UTC (rev 12829)
@@ -418,14 +418,14 @@
   if ( level == 1 )
   {
     QgsDebugMsg( "Cannot open vector on level 2" );
-    QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector ") + mapName + tr(" in mapset ") + mapset + tr (" on level 2 (topology not available, try to rebuild tobopoly using v.build module)." ) );
+    QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module)." ).arg( mapName ).arg( mapset ) );
     Vect_close( &map );
     return list;
   } 
   else if ( level < 1 )
   {
     QgsDebugMsg( "Cannot open vector" );
-    QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector ") + mapName + tr(" in mapset ") + mapset );
+    QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( mapName ).arg( mapset ) );
     return list;
   }