respect overriden locale in helpviewer and fix link typo

jef · jef · commit 3f8c05a8b457 · 2009-12-20T15:14:38.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12536 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
@@ -79,7 +79,7 @@ IF (${QTVERSION} STRLESS "4.3.0")
     )
 ELSE (${QTVERSION} STRLESS "4.3.0")
   TARGET_LINK_LIBRARIES(qgis_help
-    ${QT_QTCORE_LIBRA} 
+    ${QT_QTCORE_LIBRARY} 
     ${QT_QTGUI_LIBRARY} 
     ${QT_QTNETWORK_LIBRARY} 
     ${QT_QTSVG_LIBRARY} 
diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp
@@ -49,6 +49,12 @@ int main( int argc, char ** argv )
   if ( myTranslationCode.isEmpty() )
   {
     myTranslationCode = QLocale::system().name();
+
+    QSettings settings;
+    if( settings.value( "locale/overrideFlag", false ).toBool() )
+    {
+      myTranslationCode = settings.value( "locale/userLocale", "en_US" ).toString();
+    }
   }
   QgsDebugMsg( QString( "Setting translation to %1/qgis_%2" ).arg( i18nPath ).arg( myTranslationCode ) );
 
diff --git a/src/helpviewer/qgshelpviewer.cpp b/src/helpviewer/qgshelpviewer.cpp
@@ -104,7 +104,14 @@ void QgsHelpViewer::loadContext( const QString &contextId )
      * determine the locale and create the file name from
      * the context id
      */
-    QString lang( QLocale::system().name() );
+    QString lang = QLocale::system().name();
+
+    QSettings settings;
+    if( settings.value( "locale/overrideFlag", false ).toBool() )
+    {
+       QLocale l( settings.value( "locale/userLocale", "en_US" ).toString() );
+       lang = l.name();
+    }
     /*
      * If the language isn't set on the system, assume en_US,
      * otherwise we get the banner at the top of the help file
@@ -129,7 +136,7 @@ void QgsHelpViewer::loadContext( const QString &contextId )
       // translate this for us message
       if ( !lang.contains( "en_" ) )
       {
-        helpContents = "<i>" + tr( "This help file is not available in your language. If you would like to translate it, please contact the QGIS  development team." ) + "</i><hr />";
+        helpContents = "<i>" + tr( "This help file is not available in your language %1. If you would like to translate it, please contact the QGIS  development team." ).arg( lang ) + "</i><hr />";
       }
     }
     if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ IF (${QTVERSION} STRLESS "4.3.0")`
`79`	`79`	`)`
`80`	`80`	`ELSE (${QTVERSION} STRLESS "4.3.0")`
`81`	`81`	`TARGET_LINK_LIBRARIES(qgis_help`
`82`		`- ${QT_QTCORE_LIBRA}`
	`82`	`+ ${QT_QTCORE_LIBRARY}`
`83`	`83`	`${QT_QTGUI_LIBRARY}`
`84`	`84`	`${QT_QTNETWORK_LIBRARY}`
`85`	`85`	`${QT_QTSVG_LIBRARY}`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,12 @@ int main( int argc, char ** argv )`
`49`	`49`	`if ( myTranslationCode.isEmpty() )`
`50`	`50`	`{`
`51`	`51`	`myTranslationCode = QLocale::system().name();`
	`52`	`+`
	`53`	`+ QSettings settings;`
	`54`	`+ if( settings.value( "locale/overrideFlag", false ).toBool() )`
	`55`	`+ {`
	`56`	`+ myTranslationCode = settings.value( "locale/userLocale", "en_US" ).toString();`
	`57`	`+ }`
`52`	`58`	`}`
`53`	`59`	`QgsDebugMsg( QString( "Setting translation to %1/qgis_%2" ).arg( i18nPath ).arg( myTranslationCode ) );`
`54`	`60`