Expression builder: Nicer help not found message

NathanW2 · NathanW2 · commit 5704ff1e1f59 · 2012-02-01T19:12:58.000+10:00
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -409,6 +409,11 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio
   QString helpContents;
   QFile file( fullHelpPath );
   // check to see if the localized version exists
+
+  QString missingError = tr("<h3>Opps! QGIS can't find help for this function.</h3>"
+                            "The help file for %1 was not found for your language<br>"
+                            "If you would like to create it, contact the QGIS development team"
+                            ).arg( functionName->text() );
   if ( !file.exists() )
   {
     // change the file name to the en_US version (default)
@@ -419,14 +424,14 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio
     // translate this for us message
     if ( !lang.contains( "en_" ) )
     {
-      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 />";
+      helpContents = missingError;
     }
 
   }
+
   if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
   {
-    helpContents = tr( "This help file does not exist for your language:<p><b>%1</b><p>If you would like to create it, contact the QGIS development team" )
-                   .arg( fullHelpPath );
+    helpContents = missingError;
   }
   else
   {
@@ -438,6 +443,7 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio
       helpContents += line;
     }
   }
+
   file.close();
 
   // Set the browser text to the help contents

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,11 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio`
`409`	`409`	`QString helpContents;`
`410`	`410`	`QFile file( fullHelpPath );`
`411`	`411`	`// check to see if the localized version exists`
	`412`	`+`
	`413`	`+ QString missingError = tr("<h3>Opps! QGIS can't find help for this function.</h3>"`
	`414`	`+ "The help file for %1 was not found for your language<br>"`
	`415`	`+ "If you would like to create it, contact the QGIS development team"`
	`416`	`+ ).arg( functionName->text() );`
`412`	`417`	`if ( !file.exists() )`
`413`	`418`	`{`
`414`	`419`	`// change the file name to the en_US version (default)`
`@@ -419,14 +424,14 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio`
`419`	`424`	`// translate this for us message`
`420`	`425`	`if ( !lang.contains( "en_" ) )`
`421`	`426`	`{`
`422`		`- 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 />";`
	`427`	`+ helpContents = missingError;`
`423`	`428`	`}`
`424`	`429`
`425`	`430`	`}`
	`431`	`+`
`426`	`432`	`if ( !file.open( QIODevice::ReadOnly \| QIODevice::Text ) )`
`427`	`433`	`{`
`428`		`- helpContents = tr( "This help file does not exist for your language:<p><b>%1</b><p>If you would like to create it, contact the QGIS development team" )`
`429`		`- .arg( fullHelpPath );`
	`434`	`+ helpContents = missingError;`
`430`	`435`	`}`
`431`	`436`	`else`
`432`	`437`	`{`
`@@ -438,6 +443,7 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* functio`
`438`	`443`	`helpContents += line;`
`439`	`444`	`}`
`440`	`445`	`}`
	`446`	`+`
`441`	`447`	`file.close();`
`442`	`448`
`443`	`449`	`// Set the browser text to the help contents`