Fix incorrectly capitalized accented menu entries

nyalldawson · nyalldawson · commit b65ee54527e1 · 2018-06-04T18:37:43.000+10:00
Fixes #19102
diff --git a/src/core/qgsstringutils.cpp b/src/core/qgsstringutils.cpp
@@ -68,7 +68,7 @@ QString QgsStringUtils::capitalize( const QString &string, QgsStringUtils::Capit
       {
         smallWords = QObject::tr( "a|an|and|as|at|but|by|en|for|if|in|nor|of|on|or|per|s|the|to|vs.|vs|via" ).split( '|' );
         newPhraseSeparators = QObject::tr( ".|:" ).split( '|' );
-        splitWords = QRegularExpression( QStringLiteral( "\\b" ) );
+        splitWords = QRegularExpression( QStringLiteral( "\\b" ), QRegularExpression::UseUnicodePropertiesOption );
       }
 
       const QStringList parts = string.split( splitWords, QString::SkipEmptyParts );
diff --git a/tests/src/core/testqgsstringutils.cpp b/tests/src/core/testqgsstringutils.cpp
@@ -176,6 +176,7 @@ void TestQgsStringUtils::titleCase_data()
   QTest::newRow( "last word2" ) << "Ends with small word of" << "Ends With Small Word Of";
   QTest::newRow( "string 6" ) << "Merge VRT(s)" << "Merge VRT(s)";
   QTest::newRow( "string 6" ) << "multiple sentences. more than one." << "Multiple Sentences. More Than One.";
+  QTest::newRow( "accented" ) << "extraer vértices" << "Extraer Vértices";
 }
 
 void TestQgsStringUtils::titleCase()

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ QString QgsStringUtils::capitalize( const QString &string, QgsStringUtils::Capit`
`68`	`68`	`{`
`69`	`69`	`smallWords = QObject::tr( "a\|an\|and\|as\|at\|but\|by\|en\|for\|if\|in\|nor\|of\|on\|or\|per\|s\|the\|to\|vs.\|vs\|via" ).split( '\|' );`
`70`	`70`	`newPhraseSeparators = QObject::tr( ".\|:" ).split( '\|' );`
`71`		`- splitWords = QRegularExpression( QStringLiteral( "\\b" ) );`
	`71`	`+ splitWords = QRegularExpression( QStringLiteral( "\\b" ), QRegularExpression::UseUnicodePropertiesOption );`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`const QStringList parts = string.split( splitWords, QString::SkipEmptyParts );`
Original file line number	Diff line number	Diff line change
`@@ -176,6 +176,7 @@ void TestQgsStringUtils::titleCase_data()`
`176`	`176`	`QTest::newRow( "last word2" ) << "Ends with small word of" << "Ends With Small Word Of";`
`177`	`177`	`QTest::newRow( "string 6" ) << "Merge VRT(s)" << "Merge VRT(s)";`
`178`	`178`	`QTest::newRow( "string 6" ) << "multiple sentences. more than one." << "Multiple Sentences. More Than One.";`
	`179`	`+ QTest::newRow( "accented" ) << "extraer vértices" << "Extraer Vértices";`
`179`	`180`	`}`
`180`	`181`
`181`	`182`	`void TestQgsStringUtils::titleCase()`