Skip to content

Commit c6195fe

Browse files
committed
String decapitation and wording
1 parent af252be commit c6195fe

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/core/qgsgeometryvalidator.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ void QgsGeometryValidator::validatePolygon( int idx, const QgsPolygonXY &polygon
187187
{
188188
if ( !ringInRing( polygon[i], polygon[0] ) )
189189
{
190-
QString msg = QObject::tr( "ring %1 of polygon %2 not in exterior ring" ).arg( i ).arg( idx );
190+
QString msg = QObject::tr( "Ring %1 of polygon %2 not in exterior ring" ).arg( i ).arg( idx );
191191
QgsDebugMsg( msg );
192192
emit errorFound( QgsGeometry::Error( msg ) );
193193
mErrorCount++;
@@ -235,17 +235,17 @@ void QgsGeometryValidator::run()
235235
if ( translatedErrors.empty() )
236236
{
237237
// Copied from https://git.osgeo.org/gitea/geos/geos/src/branch/master/src/operation/valid/TopologyValidationError.cpp
238-
translatedErrors.insert( QStringLiteral( "Topology Validation Error" ), QObject::tr( "Topology Validation Error", "GEOS Error" ) );
239-
translatedErrors.insert( QStringLiteral( "Repeated Point" ), QObject::tr( "Repeated Point", "GEOS Error" ) );
238+
translatedErrors.insert( QStringLiteral( "Topology Validation Error" ), QObject::tr( "Topology validation error", "GEOS Error" ) );
239+
translatedErrors.insert( QStringLiteral( "Repeated Point" ), QObject::tr( "Repeated point", "GEOS Error" ) );
240240
translatedErrors.insert( QStringLiteral( "Hole lies outside shell" ), QObject::tr( "Hole lies outside shell", "GEOS Error" ) );
241241
translatedErrors.insert( QStringLiteral( "Holes are nested" ), QObject::tr( "Holes are nested", "GEOS Error" ) );
242242
translatedErrors.insert( QStringLiteral( "Interior is disconnected" ), QObject::tr( "Interior is disconnected", "GEOS Error" ) );
243243
translatedErrors.insert( QStringLiteral( "Self-intersection" ), QObject::tr( "Self-intersection", "GEOS Error" ) );
244-
translatedErrors.insert( QStringLiteral( "Ring Self-intersection" ), QObject::tr( "Ring Self-intersection", "GEOS Error" ) );
244+
translatedErrors.insert( QStringLiteral( "Ring Self-intersection" ), QObject::tr( "Ring self-intersection", "GEOS Error" ) );
245245
translatedErrors.insert( QStringLiteral( "Nested shells" ), QObject::tr( "Nested shells", "GEOS Error" ) );
246-
translatedErrors.insert( QStringLiteral( "Duplicate Rings" ), QObject::tr( "Duplicate Rings", "GEOS Error" ) );
246+
translatedErrors.insert( QStringLiteral( "Duplicate Rings" ), QObject::tr( "Duplicate rings", "GEOS Error" ) );
247247
translatedErrors.insert( QStringLiteral( "Too few points in geometry component" ), QObject::tr( "Too few points in geometry component", "GEOS Error" ) );
248-
translatedErrors.insert( QStringLiteral( "Invalid Coordinate" ), QObject::tr( "Invalid Coordinate", "GEOS Error" ) );
248+
translatedErrors.insert( QStringLiteral( "Invalid Coordinate" ), QObject::tr( "Invalid coordinate", "GEOS Error" ) );
249249
translatedErrors.insert( QStringLiteral( "Ring is not closed" ), QObject::tr( "Ring is not closed", "GEOS Error" ) );
250250
}
251251

@@ -325,12 +325,12 @@ void QgsGeometryValidator::run()
325325

326326
if ( ringInRing( mp[i][0], mp[j][0] ) )
327327
{
328-
emit errorFound( QgsGeometry::Error( QObject::tr( "Polygon %1 inside polygon %2" ).arg( i ).arg( j ) ) );
328+
emit errorFound( QgsGeometry::Error( QObject::tr( "Polygon %1 lies inside polygon %2" ).arg( i ).arg( j ) ) );
329329
mErrorCount++;
330330
}
331331
else if ( ringInRing( mp[j][0], mp[i][0] ) )
332332
{
333-
emit errorFound( QgsGeometry::Error( QObject::tr( "Polygon %1 inside polygon %2" ).arg( j ).arg( i ) ) );
333+
emit errorFound( QgsGeometry::Error( QObject::tr( "Polygon %1 lies inside polygon %2" ).arg( j ).arg( i ) ) );
334334
mErrorCount++;
335335
}
336336
else

0 commit comments

Comments
 (0)