Skip to content

Commit 3d6aa9c

Browse files
committedNov 25, 2017
fix en_US locale handling in QgsHelp
1 parent 72553a6 commit 3d6aa9c

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed
 

‎src/core/qgsapplication.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,14 @@ QString QgsApplication::locale()
825825
bool overrideLocale = settings.value( QStringLiteral( "locale/overrideFlag" ), false ).toBool();
826826
if ( overrideLocale )
827827
{
828-
return settings.value( QStringLiteral( "locale/userLocale" ), QString() ).toString();
828+
QString locale = settings.value( QStringLiteral( "locale/userLocale" ), QString() ).toString();
829+
// don't differentiate en_US and en_GB
830+
if ( locale.startsWith( QStringLiteral( "en" ), Qt::CaseInsensitive ) )
831+
{
832+
return locale.left( 2 );
833+
}
834+
835+
return locale;
829836
}
830837
else
831838
{

0 commit comments

Comments
 (0)
Please sign in to comment.