Skip to content

Commit 899dcbf

Browse files
committed
Fix assert crash for non-English UI locale (fixes #20834)
1 parent b7a607c commit 899dcbf

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

src/app/qgisapp.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10451,15 +10451,15 @@ QMap< QString, QString > QgisApp::projectPropertiesPagesMap()
1045110451
static std::once_flag initialized;
1045210452
std::call_once( initialized, []
1045310453
{
10454-
sProjectPropertiesPagesMap.insert( tr( "General" ), QStringLiteral( "mProjOptsGeneral" ) );
10455-
sProjectPropertiesPagesMap.insert( tr( "Metadata" ), QStringLiteral( "mMetadataPage" ) );
10456-
sProjectPropertiesPagesMap.insert( tr( "CRS" ), QStringLiteral( "mProjOptsCRS" ) );
10457-
sProjectPropertiesPagesMap.insert( tr( "Default Styles" ), QStringLiteral( "mProjOptsSymbols" ) );
10458-
sProjectPropertiesPagesMap.insert( tr( "Data Sources" ), QStringLiteral( "mTab_DataSources" ) );
10459-
sProjectPropertiesPagesMap.insert( tr( "Relations" ), QStringLiteral( "mTabRelations" ) );
10460-
sProjectPropertiesPagesMap.insert( tr( "Variables" ), QStringLiteral( "mTab_Variables" ) );
10461-
sProjectPropertiesPagesMap.insert( tr( "Macros" ), QStringLiteral( "mProjOptsMacros" ) );
10462-
sProjectPropertiesPagesMap.insert( tr( "QGIS Server" ), QStringLiteral( "mProjOptsOWS" ) );
10454+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "General" ), QStringLiteral( "mProjOptsGeneral" ) );
10455+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "Metadata" ), QStringLiteral( "mMetadataPage" ) );
10456+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "CRS" ), QStringLiteral( "mProjOptsCRS" ) );
10457+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "Default Styles" ), QStringLiteral( "mProjOptsSymbols" ) );
10458+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "Data Sources" ), QStringLiteral( "mTab_DataSources" ) );
10459+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "Relations" ), QStringLiteral( "mTabRelations" ) );
10460+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "Variables" ), QStringLiteral( "mTab_Variables" ) );
10461+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "Macros" ), QStringLiteral( "mProjOptsMacros" ) );
10462+
sProjectPropertiesPagesMap.insert( QCoreApplication::translate( "QgsProjectPropertiesBase", "QGIS Server" ), QStringLiteral( "mProjOptsOWS" ) );
1046310463
} );
1046410464

1046510465
return sProjectPropertiesPagesMap;
@@ -10511,24 +10511,24 @@ QMap< QString, int > QgisApp::optionsPagesMap()
1051110511
static std::once_flag initialized;
1051210512
std::call_once( initialized, []
1051310513
{
10514-
sOptionsPagesMap.insert( tr( "General" ), 0 );
10515-
sOptionsPagesMap.insert( tr( "System" ), 1 );
10516-
sOptionsPagesMap.insert( tr( "CRS" ), 2 );
10517-
sOptionsPagesMap.insert( tr( "Data Sources" ), 3 );
10518-
sOptionsPagesMap.insert( tr( "Rendering" ), 4 );
10519-
sOptionsPagesMap.insert( tr( "Canvas & Legend" ), 5 );
10520-
sOptionsPagesMap.insert( tr( "Map Tools" ), 6 );
10521-
sOptionsPagesMap.insert( tr( "Colors" ), 7 );
10522-
sOptionsPagesMap.insert( tr( "Digitizing" ), 8 );
10523-
sOptionsPagesMap.insert( tr( "Layouts" ), 9 );
10524-
sOptionsPagesMap.insert( tr( "GDAL" ), 10 );
10525-
sOptionsPagesMap.insert( tr( "Variables" ), 11 );
10526-
sOptionsPagesMap.insert( tr( "Authentication" ), 12 );
10527-
sOptionsPagesMap.insert( tr( "Network" ), 13 );
10528-
sOptionsPagesMap.insert( tr( "Locator" ), 14 );
10529-
sOptionsPagesMap.insert( tr( "Advanced" ), 15 );
10514+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "General" ), 0 );
10515+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "System" ), 1 );
10516+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "CRS" ), 2 );
10517+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Data Sources" ), 3 );
10518+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Rendering" ), 4 );
10519+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Canvas & Legend" ), 5 );
10520+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Map Tools" ), 6 );
10521+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Colors" ), 7 );
10522+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Digitizing" ), 8 );
10523+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Layouts" ), 9 );
10524+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "GDAL" ), 10 );
10525+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Variables" ), 11 );
10526+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Authentication" ), 12 );
10527+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Network" ), 13 );
10528+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Locator" ), 14 );
10529+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Advanced" ), 15 );
1053010530
#ifdef HAVE_OPENCL
10531-
sOptionsPagesMap.insert( tr( "Acceleration" ), 16 );
10531+
sOptionsPagesMap.insert( QCoreApplication::translate( "QgsOptionsBase", "Acceleration" ), 16 );
1053210532
#endif
1053310533
} );
1053410534

0 commit comments

Comments
 (0)