ApplicationModel.st
changeset 3666 e65ca937cdbd
parent 3651 05e12fada50b
child 3667 1e851960c824
child 3670 21de0f66fa8e
--- a/ApplicationModel.st	Thu May 05 20:46:17 2016 +0200
+++ b/ApplicationModel.st	Fri May 06 04:55:51 2016 +0200
@@ -2529,40 +2529,30 @@
 
     helpText := self basicHelpTextForKey:aKey.
     helpText isNil ifTrue:[
-	masterApplication notNil ifTrue:[
-	    "here we get an already translated helpText"
-	    helpText := masterApplication helpTextForKey:aKey.
-	].
-	helpText isNil ifTrue:[
-	    "there is no help text - resolve key from resources"
-	    helpText := (self translateString:aKey) withCRs.
-	].
-	^ helpText.
-
-"/        aKey isSymbol ifFalse:[
-"/            ^ nil
-"/        ].
-"/        "/ mhmh - is this a good idea ?
-"/        "/ if someone already maps the flyByHelpTexts to the helpTexts
-"/        helpText := self flyByHelpTextForKey:aKey.
-"/        helpText notNil ifTrue:[ ^ helpText ].
-	^ nil.
-"/        ^ self resources string:'Sorry, no help for: %1' with:aKey "/ nil
+        masterApplication notNil ifTrue:[
+            "here we get an already translated helpText"
+            helpText := masterApplication helpTextForKey:aKey.
+        ].
+        helpText isNil ifTrue:[
+            "there is no help text - resolve key from resources"
+            helpText := (self translateString:aKey) withCRs.
+        ].
+        ^ helpText.
     ].
 
     "/ kludge to allow for dynamic translation by the application itself.
     helpText isBlock ifTrue:[
-	^ helpText value.
+        ^ helpText value.
     ].
 
     "get the translation"
     translatedHelpText := self translateString:helpText.
     translatedHelpText == helpText ifTrue:[
-	"there is no translation in the resources - maybe there is one for the key?"
-	translatedKey := self translateString:aKey.
-	translatedKey ~~ aKey ifTrue:[
-	     translatedHelpText := translatedKey.
-	].
+        "there is no translation in the resources - maybe there is one for the key?"
+        translatedKey := self translateString:aKey.
+        translatedKey ~~ aKey ifTrue:[
+             translatedHelpText := translatedKey.
+        ].
     ].
     ^ translatedHelpText withCRs.