From 28d6ff7da56180207679cfbdf9a95b2db6eb55ab Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 23 Jun 2025 09:14:39 -0700 Subject: [PATCH] chore: Update messages for keyboard-experiment. (#9152) * chore: Remove unused messages. * fix: Remove unneeded message placeholders. * feat: Add additional messages used in the keyboard experiment. * chore: Update messages. --- msg/json/en.json | 32 +++++++------------ msg/json/qqq.json | 20 +++--------- msg/messages.js | 78 +++++++++++------------------------------------ 3 files changed, 34 insertions(+), 96 deletions(-) diff --git a/msg/json/en.json b/msg/json/en.json index e7c468d28..5494d7fb0 100644 --- a/msg/json/en.json +++ b/msg/json/en.json @@ -1,7 +1,7 @@ { "@metadata": { "author": "Ellen Spertus ", - "lastupdated": "2025-04-21 10:42:10.549634", + "lastupdated": "2025-06-17 15:36:41.845826", "locale": "en", "messagedocumentation" : "qqq" }, @@ -398,22 +398,8 @@ "COLLAPSED_WARNINGS_WARNING": "Collapsed blocks contain warnings.", "DIALOG_OK": "OK", "DIALOG_CANCEL": "Cancel", - "DELETE_SHORTCUT": "Delete block (%1)", - "DELETE_KEY": "Del", - "EDIT_BLOCK_CONTENTS": "Edit Block contents (%1)", - "INSERT_BLOCK": "Insert Block (%1)", - "START_MOVE": "Start move", - "FINISH_MOVE": "Finish move", - "ABORT_MOVE": "Abort move", - "MOVE_LEFT_CONSTRAINED": "Move left, constrained", - "MOVE_RIGHT_CONSTRAINED": "Move right constrained", - "MOVE_UP_CONSTRAINED": "Move up, constrained", - "MOVE_DOWN_CONSTRAINED": "Move down constrained", - "MOVE_LEFT_UNCONSTRAINED": "Move left, unconstrained", - "MOVE_RIGHT_UNCONSTRAINED": "Move right, unconstrained", - "MOVE_UP_UNCONSTRAINED": "Move up unconstrained", - "MOVE_DOWN_UNCONSTRAINED": "Move down, unconstrained", - "MOVE_BLOCK": "Move Block (%1)", + "EDIT_BLOCK_CONTENTS": "Edit Block contents", + "MOVE_BLOCK": "Move Block", "WINDOWS": "Windows", "MAC_OS": "macOS", "CHROME_OS": "ChromeOS", @@ -423,11 +409,15 @@ "COMMAND_KEY": "⌘ Command", "OPTION_KEY": "⌥ Option", "ALT_KEY": "Alt", - "CUT_SHORTCUT": "Cut (%1)", - "COPY_SHORTCUT": "Copy (%1)", - "PASTE_SHORTCUT": "Paste (%1)", + "CUT_SHORTCUT": "Cut", + "COPY_SHORTCUT": "Copy", + "PASTE_SHORTCUT": "Paste", "HELP_PROMPT": "Press %1 for help on keyboard controls", "SHORTCUTS_GENERAL": "General", "SHORTCUTS_EDITING": "Editing", - "SHORTCUTS_CODE_NAVIGATION": "Code navigation" + "SHORTCUTS_CODE_NAVIGATION": "Code navigation", + "KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT": "Hold %1 and use arrow keys to move freely, then %2 to accept the position", + "KEYBOARD_NAV_CONSTRAINED_MOVE_HINT": "Use the arrow keys to move, then %1 to accept the position", + "KEYBOARD_NAV_COPIED_HINT": "Copied. Press %1 to paste.", + "KEYBOARD_NAV_CUT_HINT": "Cut. Press %1 to paste." } diff --git a/msg/json/qqq.json b/msg/json/qqq.json index 5436da59f..5e03efc41 100644 --- a/msg/json/qqq.json +++ b/msg/json/qqq.json @@ -405,21 +405,7 @@ "COLLAPSED_WARNINGS_WARNING": "warning - This appears if the user collapses a block, and blocks inside that block have warnings attached to them. It should inform the user that the block they collapsed contains blocks that have warnings.", "DIALOG_OK": "button label - Pressing this button closes help information.\n{{Identical|OK}}", "DIALOG_CANCEL": "button label - Pressing this button cancels a proposed action.\n{{Identical|Cancel}}", - "DELETE_SHORTCUT": "menu label - Contextual menu item that deletes the focused block.", - "DELETE_KEY": "menu label - Keyboard shortcut for the Delete key, shown at the end of a menu item that deletes the focused block.", "EDIT_BLOCK_CONTENTS": "menu label - Contextual menu item that moves the keyboard navigation cursor into a subitem of the focused block.", - "INSERT_BLOCK": "menu label - Contextual menu item that prompts the user to choose a block to insert into the program at the focused location.", - "START_MOVE": "keyboard shortcut label - Contextual menu item that starts a keyboard-driven move of the focused block.", - "FINISH_MOVE": "keyboard shortcut label - Contextual menu item that ends a keyboard-driven move of the focused block.", - "ABORT_MOVE": "keyboard shortcut label - Contextual menu item that ends a keyboard-drive move of the focused block by returning it to its original location.", - "MOVE_LEFT_CONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block to the next valid location to the left.", - "MOVE_RIGHT_CONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block to the next valid location to the right.", - "MOVE_UP_CONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block to the next valid location above it.", - "MOVE_DOWN_CONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block to the next valid location below it.", - "MOVE_LEFT_UNCONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block freely to the left.", - "MOVE_RIGHT_UNCONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block freely to the right.", - "MOVE_UP_UNCONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block freely upwards.", - "MOVE_DOWN_UNCONSTRAINED": "keyboard shortcut label - Description of shortcut that moves a block freely downwards.", "MOVE_BLOCK": "menu label - Contextual menu item that starts a keyboard-driven block move.", "WINDOWS": "Name of the Microsoft Windows operating system displayed in a list of keyboard shortcuts.", "MAC_OS": "Name of the Apple macOS operating system displayed in a list of keyboard shortcuts,", @@ -436,5 +422,9 @@ "HELP_PROMPT": "Alert message shown to prompt users to review available keyboard shortcuts.", "SHORTCUTS_GENERAL": "shortcut list section header - Label for general purpose keyboard shortcuts.", "SHORTCUTS_EDITING": "shortcut list section header - Label for keyboard shortcuts related to editing a workspace.", - "SHORTCUTS_CODE_NAVIGATION": "shortcut list section header - Label for keyboard shortcuts related to moving around the workspace." + "SHORTCUTS_CODE_NAVIGATION": "shortcut list section header - Label for keyboard shortcuts related to moving around the workspace.", + "KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT": "Message shown to inform users how to move blocks to arbitrary locations with the keyboard.", + "KEYBOARD_NAV_CONSTRAINED_MOVE_HINT": "Message shown to inform users how to move blocks with the keyboard.", + "KEYBOARD_NAV_COPIED_HINT": "Message shown when an item is copied in keyboard navigation mode.", + "KEYBOARD_NAV_CUT_HINT": "Message shown when an item is cut in keyboard navigation mode." } diff --git a/msg/messages.js b/msg/messages.js index d0c3e1768..b7611b484 100644 --- a/msg/messages.js +++ b/msg/messages.js @@ -1618,68 +1618,13 @@ Blockly.Msg.DIALOG_OK = 'OK'; /// button label - Pressing this button cancels a proposed action.\n{{Identical|Cancel}} Blockly.Msg.DIALOG_CANCEL = 'Cancel'; -/** @type {string} */ -/// menu label - Contextual menu item that deletes the focused block. -Blockly.Msg.DELETE_SHORTCUT = 'Delete block (%1)'; -/** @type {string} */ -/// menu label - Keyboard shortcut for the Delete key, shown at the end of a -/// menu item that deletes the focused block. -Blockly.Msg.DELETE_KEY = 'Del'; /** @type {string} */ /// menu label - Contextual menu item that moves the keyboard navigation cursor /// into a subitem of the focused block. -Blockly.Msg.EDIT_BLOCK_CONTENTS = 'Edit Block contents (%1)'; -/** @type {string} */ -/// menu label - Contextual menu item that prompts the user to choose a block to -/// insert into the program at the focused location. -Blockly.Msg.INSERT_BLOCK = 'Insert Block (%1)'; -/** @type {string} */ -/// keyboard shortcut label - Contextual menu item that starts a keyboard-driven -/// move of the focused block. -Blockly.Msg.START_MOVE = 'Start move'; -/** @type {string} */ -/// keyboard shortcut label - Contextual menu item that ends a keyboard-driven -/// move of the focused block. -Blockly.Msg.FINISH_MOVE = 'Finish move'; -/** @type {string} */ -/// keyboard shortcut label - Contextual menu item that ends a keyboard-drive -/// move of the focused block by returning it to its original location. -Blockly.Msg.ABORT_MOVE = 'Abort move'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block to the -/// next valid location to the left. -Blockly.Msg.MOVE_LEFT_CONSTRAINED = 'Move left, constrained'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block to the -/// next valid location to the right. -Blockly.Msg.MOVE_RIGHT_CONSTRAINED = 'Move right constrained'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block to the -/// next valid location above it. -Blockly.Msg.MOVE_UP_CONSTRAINED = 'Move up, constrained'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block to the -/// next valid location below it. -Blockly.Msg.MOVE_DOWN_CONSTRAINED = 'Move down constrained'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block freely -/// to the left. -Blockly.Msg.MOVE_LEFT_UNCONSTRAINED = 'Move left, unconstrained'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block freely -/// to the right. -Blockly.Msg.MOVE_RIGHT_UNCONSTRAINED = 'Move right, unconstrained'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block freely -/// upwards. -Blockly.Msg.MOVE_UP_UNCONSTRAINED = 'Move up unconstrained'; -/** @type {string} */ -/// keyboard shortcut label - Description of shortcut that moves a block freely -/// downwards. -Blockly.Msg.MOVE_DOWN_UNCONSTRAINED = 'Move down, unconstrained'; +Blockly.Msg.EDIT_BLOCK_CONTENTS = 'Edit Block contents'; /** @type {string} */ /// menu label - Contextual menu item that starts a keyboard-driven block move. -Blockly.Msg.MOVE_BLOCK = 'Move Block (%1)'; +Blockly.Msg.MOVE_BLOCK = 'Move Block'; /** @type {string} */ /// Name of the Microsoft Windows operating system displayed in a list of /// keyboard shortcuts. @@ -1714,13 +1659,13 @@ Blockly.Msg.OPTION_KEY = '⌥ Option'; Blockly.Msg.ALT_KEY = 'Alt'; /** @type {string} */ /// menu label - Contextual menu item that cuts the focused item. -Blockly.Msg.CUT_SHORTCUT = 'Cut (%1)'; +Blockly.Msg.CUT_SHORTCUT = 'Cut'; /** @type {string} */ /// menu label - Contextual menu item that copies the focused item. -Blockly.Msg.COPY_SHORTCUT = 'Copy (%1)'; +Blockly.Msg.COPY_SHORTCUT = 'Copy'; /** @type {string} */ /// menu label - Contextual menu item that pastes the previously copied item. -Blockly.Msg.PASTE_SHORTCUT = 'Paste (%1)'; +Blockly.Msg.PASTE_SHORTCUT = 'Paste'; /** @type {string} */ /// Alert message shown to prompt users to review available keyboard shortcuts. Blockly.Msg.HELP_PROMPT = 'Press %1 for help on keyboard controls'; @@ -1735,3 +1680,16 @@ Blockly.Msg.SHORTCUTS_EDITING = 'Editing' /// shortcut list section header - Label for keyboard shortcuts related to /// moving around the workspace. Blockly.Msg.SHORTCUTS_CODE_NAVIGATION = 'Code navigation'; +/** @type {string} */ +/// Message shown to inform users how to move blocks to arbitrary locations +/// with the keyboard. +Blockly.Msg.KEYBOARD_NAV_UNCONSTRAINED_MOVE_HINT = 'Hold %1 and use arrow keys to move freely, then %2 to accept the position'; +/** @type {string} */ +/// Message shown to inform users how to move blocks with the keyboard. +Blockly.Msg.KEYBOARD_NAV_CONSTRAINED_MOVE_HINT = 'Use the arrow keys to move, then %1 to accept the position'; +/** @type {string} */ +/// Message shown when an item is copied in keyboard navigation mode. +Blockly.Msg.KEYBOARD_NAV_COPIED_HINT = 'Copied. Press %1 to paste.'; +/** @type {string} */ +/// Message shown when an item is cut in keyboard navigation mode. +Blockly.Msg.KEYBOARD_NAV_CUT_HINT = 'Cut. Press %1 to paste.'; \ No newline at end of file