fix en_US locale handling in QgsHelp

qgis · Nov 25, 2017 · 3d6aa9c · 3d6aa9c
1 parent 72553a6
commit 3d6aa9c
Showing 1 changed file with 8 additions and 1 deletion.
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
   {