sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-28 00:04:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reword message

Browse Source
This commit is contained in:
Harrissou Sant-anna 2017-10-25 07:28:31 +02:00
parent c2577ec0fc
commit a87cde271b
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/qgsloadstylefromdbdialog.cpp
View File

@ -192,7 +192,7 @@ void QgsLoadStyleFromDBDialog::deleteStyleFromDB()
int sectionLimit = mLayer->listStylesInDatabase( ids, names, descriptions, errorMsg ); int sectionLimit = mLayer->listStylesInDatabase( ids, names, descriptions, errorMsg );
if ( !errorMsg.isNull() ) if ( !errorMsg.isNull() )
{ {
QgisApp::instance()->messageBar()->pushMessage( tr( "Error occurred retrieving styles from database" ), errorMsg, QgsMessageBar::WARNING, QgisApp::instance()->messageTimeout() ); QgisApp::instance()->messageBar()->pushMessage( tr( "Error occurred while retrieving styles from database" ), errorMsg, QgsMessageBar::WARNING, QgisApp::instance()->messageTimeout() );
} }
else else
{ {

6
src/app/qgsvectorlayerproperties.cpp
View File

@ -1128,7 +1128,7 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase()
int sectionLimit = mLayer->listStylesInDatabase( ids, names, descriptions, errorMsg ); int sectionLimit = mLayer->listStylesInDatabase( ids, names, descriptions, errorMsg );
if ( !errorMsg.isNull() ) if ( !errorMsg.isNull() )
{ {
QMessageBox::warning( this, tr( "Error occurred retrieving styles from database" ), errorMsg ); QMessageBox::warning( this, tr( "Error occurred while retrieving styles from database" ), errorMsg );
return; return;
} }
@ -1143,7 +1143,7 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase()
QString qmlStyle = mLayer->getStyleFromDatabase( selectedStyleId, errorMsg ); QString qmlStyle = mLayer->getStyleFromDatabase( selectedStyleId, errorMsg );
if ( !errorMsg.isNull() ) if ( !errorMsg.isNull() )
{ {
QMessageBox::warning( this, tr( "Error occurred retrieving styles from database" ), errorMsg ); QMessageBox::warning( this, tr( "Error occurred while retrieving styles from database" ), errorMsg );
return; return;
} }
@ -1156,7 +1156,7 @@ void QgsVectorLayerProperties::showListOfStylesFromDatabase()
} }
else else
{ {
QMessageBox::warning( this, tr( "Error occurred retrieving styles from database" ), QMessageBox::warning( this, tr( "Error occurred while retrieving styles from database" ),
tr( "The retrieved style is not a valid named style. Error message: %1" ) tr( "The retrieved style is not a valid named style. Error message: %1" )
.arg( errorMsg ) ); .arg( errorMsg ) );
} }

2
src/gui/auth/qgsauthauthoritieseditor.cpp
View File

@ -515,7 +515,7 @@ void QgsAuthAuthoritiesEditor::btnRemoveCa_clicked()
if ( cert.isNull() ) if ( cert.isNull() )
{ {
messageBar()->pushMessage( tr( "Certificate could not found in database for id %1:" ).arg( digest ), messageBar()->pushMessage( tr( "Certificate could not be found in database for id %1:" ).arg( digest ),
QgsMessageBar::WARNING ); QgsMessageBar::WARNING );
return; return;
} }

8
src/providers/gdal/qgsgdalprovider.cpp
View File

@ -755,8 +755,7 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
if ( !myWarpOptions->pTransformerArg ) if ( !myWarpOptions->pTransformerArg )
{ {
QMessageBox::warning( 0, QObject::tr( "Warning" ), QMessageBox::warning( 0, QObject::tr( "Warning" ),
QObject::tr( "Cannot GDALCreateGenImgProjTransformer: " ) QObject::tr( "Cannot GDALCreateGenImgProjTransformer: %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ); // missing word?
+ QString::fromUtf8( CPLGetLastErrorMsg() ) );
return; return;
} }
@ -786,8 +785,7 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
if ( myOperation.Initialize( myWarpOptions ) != CE_None ) if ( myOperation.Initialize( myWarpOptions ) != CE_None )
{ {
QMessageBox::warning( 0, QObject::tr( "Warning" ), QMessageBox::warning( 0, QObject::tr( "Warning" ),
QObject::tr( "Cannot inittialize GDALWarpOperation : " ) QObject::tr( "Cannot initialize GDAL Warp operation : %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) );
+ QString::fromUtf8( CPLGetLastErrorMsg() ) );
return; return;
} }
@ -797,7 +795,7 @@ void QgsGdalProvider::readBlock( int bandNo, QgsRectangle const &extent, int pi
if ( myErr != CPLE_None ) if ( myErr != CPLE_None )
{ {
QMessageBox::warning( 0, QObject::tr( "Warning" ), QMessageBox::warning( 0, QObject::tr( "Warning" ),
QObject::tr( "Cannot ChunkAndWarpImage: %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) ); QObject::tr( "Cannot chunk and warp image: %1" ).arg( QString::fromUtf8( CPLGetLastErrorMsg() ) ) );
return; return;
} }

6
src/providers/grass/qgsgrass.cpp
View File

@ -2258,7 +2258,7 @@ QMap<QString, QString> QgsGrass::query( const QString &gisdbase, const QString &
} }
catch ( QgsGrass::Exception &e ) catch ( QgsGrass::Exception &e )
{ {
warning( tr( "Cannot query raster " ) + "\n" + e.what() ); warning( tr( "Cannot query raster\n%1" ).arg( e.what() ) );
} }
return result; return result;
} }
@ -2321,7 +2321,7 @@ bool QgsGrass::deleteObject( const QgsGrassObject &object )
} }
catch ( QgsGrass::Exception &e ) catch ( QgsGrass::Exception &e )
{ {
warning( tr( "Cannot delete" ) + " " + object.elementName() + " " + object.name() + ": " + e.what() ); warning( tr( "Cannot delete %1 %2: %3" ).arg( object.elementName(), object.name(), e.what() ) );
return false; return false;
} }
return true; return true;
@ -2412,7 +2412,7 @@ void QgsGrass::createTable( dbDriver *driver, const QString &tableName, const Qg
db_free_string( &dbstr ); db_free_string( &dbstr );
if ( result != DB_OK ) if ( result != DB_OK )
{ {
throw QgsGrass::Exception( QObject::tr( "Cannot create table" ) + ": " + QString::fromLatin1( db_get_error_msg() ) ); throw QgsGrass::Exception( QObject::tr( "Cannot create table: %1" ).arg( QString::fromLatin1( db_get_error_msg() ) ) );
} }
} }

6
src/providers/spatialite/qgsspatialitesourceselect.cpp
View File

@ -148,7 +148,7 @@ void QgsSpatiaLiteSourceSelect::updateStatistics()
subKey.truncate( idx ); subKey.truncate( idx );
QString msg = tr( "Are you sure you want to update the internal statistics for DB: %1?\n\n" QString msg = tr( "Are you sure you want to update the internal statistics for DB: %1?\n\n"
"This could take a long time (depending on the DB size),\n" "This could take a long time (depending on the DB size), "
"but implies better performance thereafter." ).arg( subKey ); "but implies better performance thereafter." ).arg( subKey );
QMessageBox::StandardButton result = QMessageBox::StandardButton result =
QMessageBox::information( this, tr( "Confirm Update Statistics" ), msg, QMessageBox::Ok | QMessageBox::Cancel ); QMessageBox::information( this, tr( "Confirm Update Statistics" ), msg, QMessageBox::Ok | QMessageBox::Cancel );
@ -463,11 +463,11 @@ void QgsSpatiaLiteSourceSelect::btnConnect_clicked()
break; break;
case QgsSpatiaLiteConnection::FailedToCheckMetadata: case QgsSpatiaLiteConnection::FailedToCheckMetadata:
QMessageBox::critical( this, tr( "SpatiaLite metadata check failed" ), QMessageBox::critical( this, tr( "SpatiaLite metadata check failed" ),
tr( "Failure getting table metadata ... is this really a SpatialLite database? %1\n\n%2" ).arg( mSqlitePath, errCause ) ); tr( "Failure getting table metadata... is %1 really a SpatiaLite database?\n\n%2" ).arg( mSqlitePath, errCause ) );
break; break;
default: default:
QMessageBox::critical( this, tr( "SpatiaLite Error" ), QMessageBox::critical( this, tr( "SpatiaLite Error" ),
tr( "Unexpected error when working with: %1\n\n%2" ).arg( mSqlitePath, errCause ) ); tr( "Unexpected error when working with %1\n\n%2" ).arg( mSqlitePath, errCause ) );
} }
mSqlitePath = QString(); mSqlitePath = QString();
return; return;