fix grass string

jef · jef · commit 7d15e18c4072 · 2010-01-24T15:59:54.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12829 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp
@@ -311,14 +311,14 @@ void QgsGrassPlugin::addVector()
       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;
       }
 
diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp
@@ -418,14 +418,14 @@ QStringList QgsGrassSelect::vectorLayers( QString gisdbase,
   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;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -311,14 +311,14 @@ void QgsGrassPlugin::addVector()`
`311`	`311`	`if ( level == 1 )`
`312`	`312`	`{`
`313`	`313`	`QgsDebugMsg( "Cannot open vector on level 2" );`
`314`		`- 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)." ) );`
	`314`	`+ 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 ) );`
`315`	`315`	`Vect_close( &map );`
`316`	`316`	`return;`
`317`	`317`	`}`
`318`	`318`	`else if ( level < 1 )`
`319`	`319`	`{`
`320`	`320`	`QgsDebugMsg( "Cannot open vector" );`
`321`		`- QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector ") + sel->map + tr(" in mapset ") + sel->mapset );`
	`321`	`+ QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( sel->map ).arg( sel->mapset ) );`
`322`	`322`	`return;`
`323`	`323`	`}`
`324`	`324`
Original file line number	Diff line number	Diff line change
`@@ -418,14 +418,14 @@ QStringList QgsGrassSelect::vectorLayers( QString gisdbase,`
`418`	`418`	`if ( level == 1 )`
`419`	`419`	`{`
`420`	`420`	`QgsDebugMsg( "Cannot open vector on level 2" );`
`421`		`- 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)." ) );`
	`421`	`+ 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 ) );`
`422`	`422`	`Vect_close( &map );`
`423`	`423`	`return list;`
`424`	`424`	`}`
`425`	`425`	`else if ( level < 1 )`
`426`	`426`	`{`
`427`	`427`	`QgsDebugMsg( "Cannot open vector" );`
`428`		`- QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector ") + mapName + tr(" in mapset ") + mapset );`
	`428`	`+ QMessageBox::warning( 0, tr( "Warning" ), tr( "Cannot open vector %1 in mapset %2").arg( mapName ).arg( mapset ) );`
`429`	`429`	`return list;`
`430`	`430`	`}`
`431`	`431`