Skip to content

Commit 4ff41e7

Browse files
authoredFeb 12, 2022
Merge pull request #47262 from DelazJ/plural
More pluralization of strings (part 1)
2 parents 0a71331 + 97d89fd commit 4ff41e7

File tree

54 files changed

+127
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+127
-144
lines changed
 

‎src/analysis/processing/qgsalgorithmangletonearest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ QVariantMap QgsAngleToNearestAlgorithm::processAlgorithm( const QVariantMap &par
266266
{
267267
if ( nearest.count() > 1 )
268268
{
269-
feedback->pushInfo( QObject::tr( "Multiple matching features found at same distance from search feature, found %1 features" ).arg( nearest.count() ) );
269+
feedback->pushInfo( QObject::tr( "Multiple matching features found at same distance from search feature, found %n feature(s)", nullptr, nearest.count() ) );
270270
}
271271

272272
const QgsGeometry joinLine = f.geometry().shortestLine( index.geometry( nearest.at( 0 ) ) );

‎src/analysis/processing/qgsalgorithmcategorizeusingstyle.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ QVariantMap QgsCategorizeUsingStyleAlgorithm::processAlgorithm( const QVariantMa
234234

235235
if ( matched > 0 )
236236
{
237-
feedback->pushInfo( QObject::tr( "Matched %1 categories to symbols from file." ).arg( matched ) );
237+
feedback->pushInfo( QObject::tr( "Matched %n categories to symbols from file.", nullptr, matched ) );
238238
}
239239
else
240240
{
@@ -243,7 +243,7 @@ QVariantMap QgsCategorizeUsingStyleAlgorithm::processAlgorithm( const QVariantMa
243243

244244
if ( !unmatchedCategories.empty() )
245245
{
246-
feedback->pushInfo( QObject::tr( "\n%1 categories could not be matched:" ).arg( unmatchedCategories.count() ) );
246+
feedback->pushInfo( QObject::tr( "\n%n categorie(s) could not be matched:", nullptr, unmatchedCategories.count() ) );
247247
std::sort( unmatchedCategories.begin(), unmatchedCategories.end() );
248248
for ( const QVariant &cat : std::as_const( unmatchedCategories ) )
249249
{
@@ -260,7 +260,7 @@ QVariantMap QgsCategorizeUsingStyleAlgorithm::processAlgorithm( const QVariantMa
260260

261261
if ( !unmatchedSymbols.empty() )
262262
{
263-
feedback->pushInfo( QObject::tr( "\n%1 symbols in style were not matched:" ).arg( unmatchedSymbols.count() ) );
263+
feedback->pushInfo( QObject::tr( "\n%n symbol(s) in style were not matched:", nullptr, unmatchedSymbols.count() ) );
264264
std::sort( unmatchedSymbols.begin(), unmatchedSymbols.end() );
265265
for ( const QString &name : std::as_const( unmatchedSymbols ) )
266266
{

0 commit comments

Comments
 (0)
Please sign in to comment.