Skip to content

Commit

Permalink
Plural disambiguation
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Apr 26, 2018
1 parent 87bb4bc commit 806545b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/app/qgisapp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7327,7 +7327,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
}

//validate selection
int numberOfSelectedFeatures = vlayer->selectedFeatureIds().size();
const int numberOfSelectedFeatures = vlayer->selectedFeatureCount();
if ( numberOfSelectedFeatures == 0 )
{
messageBar()->pushMessage( tr( "No Features Selected" ),
Expand Down Expand Up @@ -7355,7 +7355,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
if ( !allFeaturesInView )
{
// for extra safety to make sure we are not removing geometries by accident
int res = QMessageBox::warning( mMapCanvas, tr( "Delete %1 features on layer \"%2\"" ).arg( QString::number( vlayer->selectedFeatureCount() ), vlayer->name() ),
int res = QMessageBox::warning( mMapCanvas, tr( "Delete %n feature(s) on layer \"%1\"", nullptr, numberOfSelectedFeatures ).arg( vlayer->name() ),
tr( "Some of the selected features are outside of the current map view. Would you still like to continue?" ),
QMessageBox::Yes | QMessageBox::No );
if ( res != QMessageBox::Yes )
Expand All @@ -7368,7 +7368,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
if ( !vlayer->deleteSelectedFeatures( &deletedCount ) )
{
messageBar()->pushMessage( tr( "Problem deleting features" ),
tr( "A problem occurred during deletion of %1 feature(s)" ).arg( numberOfSelectedFeatures - deletedCount ),
tr( "A problem occurred during deletion on layer \"%1\". %n feature(s) not deleted.", nullptr, numberOfSelectedFeatures - deletedCount ).arg( vlayer->name() ),
Qgis::Warning );
}
else
Expand Down

0 comments on commit 806545b

Please sign in to comment.