Title: [commits] (stearns) [11342] Another shot at fixing bug 5670 (Unknown accel modifier 's ctrl' in mac logs)...
Revision
11342
Author
stearns
Date
2006-08-07 12:46:20 -0700 (Mon, 07 Aug 2006)

Log Message

Another shot at fixing bug 5670 (Unknown accel modifier 's ctrl' in mac logs)... thanks to debugging help from Reid, it appears that we were setting the Script menu item to include the accelerator twice.

(Also, a minor debug-logging change.)

Modified Paths

Diff

Modified: trunk/chandler/parcels/osaf/framework/blocks/Block.py (11341 => 11342)

--- trunk/chandler/parcels/osaf/framework/blocks/Block.py	2006-08-07 19:42:46 UTC (rev 11341)
+++ trunk/chandler/parcels/osaf/framework/blocks/Block.py	2006-08-07 19:46:20 UTC (rev 11342)
@@ -1091,6 +1091,9 @@
     if isinstance(thing, Block):
         return getattr(thing, 'blockName', '(unnamed %s)' % thing.__class__.__name__)
     
+    if isinstance(thing, BlockEvent):
+        return getattr(thing, 'itsName', '(unnamed %s)' % thing.__class__.__name__)
+    
     blockItem = getattr(thing, 'blockItem', None)
     if blockItem is not None:
         return '%s on %s' % (thing.__class__.__name__, debugName(blockItem))

Modified: trunk/chandler/parcels/osaf/framework/blocks/PimBlocks.py (11341 => 11342)

--- trunk/chandler/parcels/osaf/framework/blocks/PimBlocks.py	2006-08-07 19:42:46 UTC (rev 11341)
+++ trunk/chandler/parcels/osaf/framework/blocks/PimBlocks.py	2006-08-07 19:46:20 UTC (rev 11342)
@@ -247,9 +247,9 @@
             enable = canExecute and len(set(states)) == 1
         event.arguments ['Enable'] = enable
         if enable:
-            menuTitle = u'Run "%s"\tCtrl+S' % item.about
+            menuTitle = _(u'Run "%(name)s"') % { 'name': item.about }
         else:
-            menuTitle = u'Run a Script\tCtrl+S'
+            menuTitle = _(u'Run a Script')
         event.arguments ['Text'] = menuTitle
 
     def CanRemove(self):




_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits

Reply via email to