Skip to content

Commit

Permalink
translation string improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Sep 22, 2017
1 parent 8b32d8d commit 782ed47
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/app/pluginmanager/qgspluginmanager.cpp
Expand Up @@ -900,7 +900,7 @@ void QgsPluginManager::showPluginDetails( QStandardItem *item )
if ( ! metadata->value( QStringLiteral( "changelog" ) ).isEmpty() )
{
html += QLatin1String( "<br/>" );
QString changelog = tr( "Changelog:<br/>%1 <br/>" ).arg( metadata->value( QStringLiteral( "changelog" ) ) );
QString changelog = QStringLiteral( "%1:<br/>%2 <br/>" ).arg( tr( "Changelog" ), metadata->value( QStringLiteral( "changelog" ) ) );
html += changelog.replace( '\n', QLatin1String( "<br/>" ) );
}

Expand Down
36 changes: 24 additions & 12 deletions src/core/processing/qgsnativealgorithms.cpp
Expand Up @@ -1176,7 +1176,9 @@ QVariantMap QgsRemoveNullGeometryAlgorithm::processAlgorithm( const QVariantMap

QString QgsBoundingBoxAlgorithm::shortHelpString() const
{
return QObject::tr( "This algorithm calculates the bounding box (envelope) for each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a bounding box calculation which covers the whole layer or grouped subsets of features." );
return QObject::tr( "This algorithm calculates the bounding box (envelope) for each feature in an input layer." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a bounding box calculation which covers the whole layer or grouped subsets of features." );
}

QgsBoundingBoxAlgorithm *QgsBoundingBoxAlgorithm::createInstance() const
Expand Down Expand Up @@ -1214,7 +1216,9 @@ QgsFeature QgsBoundingBoxAlgorithm::processFeature( const QgsFeature &feature, Q

QString QgsOrientedMinimumBoundingBoxAlgorithm::shortHelpString() const
{
return QObject::tr( "This algorithm calculates the minimum area rotated rectangle which covers each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a oriented bounding box calculation which covers the whole layer or grouped subsets of features." );
return QObject::tr( "This algorithm calculates the minimum area rotated rectangle which covers each feature in an input layer." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a oriented bounding box calculation which covers the whole layer or grouped subsets of features." );
}

QgsOrientedMinimumBoundingBoxAlgorithm *QgsOrientedMinimumBoundingBoxAlgorithm::createInstance() const
Expand Down Expand Up @@ -1264,7 +1268,9 @@ void QgsMinimumEnclosingCircleAlgorithm::initParameters( const QVariantMap & )

QString QgsMinimumEnclosingCircleAlgorithm::shortHelpString() const
{
return QObject::tr( "This algorithm calculates the minimum enclosing circle which covers each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a minimal enclosing circle calculation which covers the whole layer or grouped subsets of features." );
return QObject::tr( "This algorithm calculates the minimum enclosing circle which covers each feature in an input layer." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a minimal enclosing circle calculation which covers the whole layer or grouped subsets of features." );
}

QgsMinimumEnclosingCircleAlgorithm *QgsMinimumEnclosingCircleAlgorithm::createInstance() const
Expand Down Expand Up @@ -1305,7 +1311,9 @@ QgsFeature QgsMinimumEnclosingCircleAlgorithm::processFeature( const QgsFeature

QString QgsConvexHullAlgorithm::shortHelpString() const
{
return QObject::tr( "This algorithm calculates the convex hull for each feature in an input layer.\n\nSee the 'Minimum bounding geometry' algorithm for a convex hull calculation which covers the whole layer or grouped subsets of features." );
return QObject::tr( "This algorithm calculates the convex hull for each feature in an input layer." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "See the 'Minimum bounding geometry' algorithm for a convex hull calculation which covers the whole layer or grouped subsets of features." );
}

QgsConvexHullAlgorithm *QgsConvexHullAlgorithm::createInstance() const
Expand Down Expand Up @@ -1345,10 +1353,12 @@ QgsFeature QgsConvexHullAlgorithm::processFeature( const QgsFeature &feature, Qg
QString QgsPromoteToMultipartAlgorithm::shortHelpString() const
{
return QObject::tr( "This algorithm takes a vector layer with singlepart geometries and generates a new one in which all geometries are "
"multipart. Input features which are already multipart features will remain unchanged.\n\n"
"This algorithm can be used to force geometries to multipart types in order to be compatibility with data providers "
"with strict singlepart/multipart compatibility checks.\n\n"
"See the 'Collect geometries' or 'Aggregate' algorithms for alternative options." );
"multipart. Input features which are already multipart features will remain unchanged." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "This algorithm can be used to force geometries to multipart types in order to be compatibility with data providers "
"with strict singlepart/multipart compatibility checks." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "See the 'Collect geometries' or 'Aggregate' algorithms for alternative options." );
}

QgsPromoteToMultipartAlgorithm *QgsPromoteToMultipartAlgorithm::createInstance() const
Expand Down Expand Up @@ -1387,10 +1397,12 @@ QString QgsCollectAlgorithm::shortHelpString() const
{
return QObject::tr( "This algorithm takes a vector layer and collects its geometries into new multipart geometries. One or more attributes can "
"be specified to collect only geometries belonging to the same class (having the same value for the specified attributes), alternatively "
"all geometries can be collected.\n\n"
"All output geometries will be converted to multi geometries, even those with just a single part. "
"This algorithm does not dissolve overlapping geometries - they will be collected together without modifying the shape of each geometry part.\n\n"
"See the 'Promote to multipart' or 'Aggregate' algorithms for alternative options." );
"all geometries can be collected." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "All output geometries will be converted to multi geometries, even those with just a single part. "
"This algorithm does not dissolve overlapping geometries - they will be collected together without modifying the shape of each geometry part." ) +
QStringLiteral( "\n\n" ) +
QObject::tr( "See the 'Promote to multipart' or 'Aggregate' algorithms for alternative options." );
}

QgsCollectAlgorithm *QgsCollectAlgorithm::createInstance() const
Expand Down
4 changes: 2 additions & 2 deletions src/providers/geonode/qgsgeonodenewconnection.cpp
Expand Up @@ -43,13 +43,13 @@ void QgsGeoNodeNewConnection::testConnection()
{
QMessageBox::information( this,
tr( "Test connection" ),
tr( "\nConnection to %1 was successful, \n\n%1 is a valid geonode instance.\n\n" ).arg( url() ) );
tr( "\nConnection to %1 was successful, \n\n%1 is a valid GeoNode instance.\n\n" ).arg( url() ) );
}
else
{
QMessageBox::information( this,
tr( "Test connection" ),
tr( "\nConnection failed, \n\nplease check whether %1 is a valid geonode instance.\n\n" ).arg( url() ) );
tr( "\nConnection failed, \n\nplease check whether %1 is a valid GeoNode instance.\n\n" ).arg( url() ) );
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/ui/qgsgeonodesourceselectbase.ui
Expand Up @@ -11,13 +11,13 @@
</rect>
</property>
<property name="windowTitle">
<string>Add Geonode Layer</string>
<string>Add GeoNode Layer</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QGroupBox" name="GroupBox1">
<property name="title">
<string>Geonode connections</string>
<string>GeoNode connections</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
Expand Down

0 comments on commit 782ed47

Please sign in to comment.