fix en_US locale handling in QgsHelp

alexbruy · alexbruy · commit 3d6aa9c9f2fc · 2017-11-25T11:54:33.000+02:00
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -825,7 +825,14 @@ QString QgsApplication::locale()
   bool overrideLocale = settings.value( QStringLiteral( "locale/overrideFlag" ), false ).toBool();
   if ( overrideLocale )
   {
-    return settings.value( QStringLiteral( "locale/userLocale" ), QString() ).toString();
+    QString locale = settings.value( QStringLiteral( "locale/userLocale" ), QString() ).toString();
+    // don't differentiate en_US and en_GB
+    if ( locale.startsWith( QStringLiteral( "en" ), Qt::CaseInsensitive ) )
+    {
+      return locale.left( 2 );
+    }
+
+    return locale;
   }
   else
   {

Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,14 @@ QString QgsApplication::locale()`
`825`	`825`	`bool overrideLocale = settings.value( QStringLiteral( "locale/overrideFlag" ), false ).toBool();`
`826`	`826`	`if ( overrideLocale )`
`827`	`827`	`{`
`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;`
`829`	`836`	`}`
`830`	`837`	`else`
`831`	`838`	`{`