Use Blockly.Msg.When instead of 'when'.

If the blockly workspace is RTL, reverse the words in the button text.

Author: lizlooney

src/blocks/mrc_event_handler.ts

@@ -409,6 +409,7 @@ function generateRegisterEventHandler(
 // Functions used for creating blocks for the toolbox.
 
 export function addRobotEventHandlerBlocks(
+    workspace: Blockly.WorkspaceSvg,
     events: storageModuleContent.Event[],
     eventHandlerBlocks: EventHandlerBlock[],
     contents: toolboxItems.ContentsType[]) {
@@ -420,7 +421,7 @@ export function addRobotEventHandlerBlocks(
   events.forEach(event => {
     if (eventIds.includes(event.eventId)) {
       // If there is already an event handler for this event, put a button in the toolbox.
-      const text = '\u00A0\u00A0when\u00A0\u00A0' + SENDER_VALUE_ROBOT + '\u00A0\u00A0' + event.name + '\u00A0\u00A0';
+      const text = makeButtonText(workspace, SENDER_VALUE_ROBOT, event.name);
       const button = new toolboxItems.Button(text, BUTTON_CALLBACK_KEY, BUTTON_STYLE);
       contents.push(button);
     } else {
@@ -450,6 +451,7 @@ function createRobotEventHandlerBlock(
 }
 
 export function addMechanismEventHandlerBlocks(
+    workspace: Blockly.WorkspaceSvg,
     mechanismInRobot: storageModuleContent.MechanismInRobot,
     events: storageModuleContent.Event[],
     eventHandlerBlocks: EventHandlerBlock[],
@@ -462,7 +464,7 @@ export function addMechanismEventHandlerBlocks(
   events.forEach(event => {
     if (eventIds.includes(event.eventId)) {
       // If there is already an event handler for this event, put a button in the toolbox.
-      const text = 'when ' + mechanismInRobot.name + ' ' + event.name;
+      const text = makeButtonText(workspace, mechanismInRobot.name, event.name);
       const button = new toolboxItems.Button(text, BUTTON_CALLBACK_KEY, BUTTON_STYLE);
       contents.push(button);
     } else {
@@ -471,6 +473,16 @@ export function addMechanismEventHandlerBlocks(
   });
 }
 
+function makeButtonText(
+    workspace: Blockly.WorkspaceSvg, senderName: string, eventName: string): string {
+  // Add non-breakable spaces so it looks more like an event handler block.
+  const spaces = '\u00A0\u00A0';
+  if (workspace.RTL) {
+    return spaces + eventName + spaces + senderName + spaces + Blockly.Msg.WHEN + spaces;
+  }
+  return spaces + Blockly.Msg.WHEN + spaces + senderName + spaces + eventName + spaces;
+}
+
 function createMechanismEventHandlerBlock(
     mechanismInRobot: storageModuleContent.MechanismInRobot,
     event: storageModuleContent.Event): toolboxItems.Block {

src/toolbox/event_handlers_category.ts

@@ -97,7 +97,7 @@ class EventHandlersCategory {
     // Get the list of events from the robot.
     const eventsFromRobot = editor.getEventsFromRobot();
     const eventHandlerBlocks = editor.getRobotEventHandlersAlreadyInWorkspace();
-    addRobotEventHandlerBlocks(eventsFromRobot, eventHandlerBlocks, contents);
+    addRobotEventHandlerBlocks(workspace, eventsFromRobot, eventHandlerBlocks, contents);
 
     const toolboxInfo = {
       contents: contents,
@@ -124,7 +124,7 @@ class EventHandlersCategory {
       const eventHandlerBlocks = editor.getMechanismEventHandlersAlreadyInWorkspace(
           this.mechanismInRobot);
       addMechanismEventHandlerBlocks(
-          this.mechanismInRobot, eventsFromMechanism, eventHandlerBlocks, contents);
+          workspace, this.mechanismInRobot, eventsFromMechanism, eventHandlerBlocks, contents);
       if (contents.length === 0) {
         const label : toolboxItems.Label = new toolboxItems.Label(Blockly.Msg['NO_MECHANISM_CONTENTS']);
         contents.push(label);