From cece3f629623bd6bd08fd2ab1b0e7d6e3a5a1dfe Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 21 Apr 2025 08:54:39 -0700 Subject: [PATCH] chore: Add messages from the keyboard experiment. (#8904) * chore: Add messages from the keyboard experiment. * fix: Resolve duplicate message ID. * fix: Use placeholders for keyboard shortcuts. --- msg/json/en.json | 33 +++++++++++++- msg/json/qqq.json | 31 +++++++++++++- msg/messages.js | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 3 deletions(-) diff --git a/msg/json/en.json b/msg/json/en.json index 50800bc27..a2574b24a 100644 --- a/msg/json/en.json +++ b/msg/json/en.json @@ -1,7 +1,7 @@ { "@metadata": { "author": "Ellen Spertus ", - "lastupdated": "2024-04-16 23:19:53.668551", + "lastupdated": "2025-04-21 08:25:34.842680", "locale": "en", "messagedocumentation" : "qqq" }, @@ -396,5 +396,34 @@ "WORKSPACE_ARIA_LABEL": "Blockly Workspace", "COLLAPSED_WARNINGS_WARNING": "Collapsed blocks contain warnings.", "DIALOG_OK": "OK", - "DIALOG_CANCEL": "Cancel" + "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)", + "WINDOWS": "Windows", + "MAC_OS": "macOS", + "CHROME_OS": "ChromeOS", + "LINUX": "Linux", + "UNKNOWN": "Unknown", + "CONTROL_KEY": "Ctrl", + "COMMAND_KEY": "⌘ Command", + "OPTION_KEY": "⌥ Option", + "ALT_KEY": "Alt", + "CUT_SHORTCUT": "Cut (%1)", + "COPY_SHORTCUT": "Copy (%1)", + "PASTE_SHORTCUT": "Paste (%1)", + "HELP_PROMPT": "Press %1 for help on keyboard controls" } diff --git a/msg/json/qqq.json b/msg/json/qqq.json index fcd8897bd..05fbaafdc 100644 --- a/msg/json/qqq.json +++ b/msg/json/qqq.json @@ -402,5 +402,34 @@ "WORKSPACE_ARIA_LABEL": "workspace - This text is read out when a user navigates to the workspace while using a screen reader.", "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}}" + "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,", + "CHROME_OS": "Name of the Google ChromeOS operating system displayed in a list of keyboard shortcuts.", + "LINUX": "Name of the GNU/Linux operating system displayed in a list of keyboard shortcuts.", + "UNKNOWN": "Placeholder name for an operating system that can't be identified in a list of keyboard shortcuts.", + "CONTROL_KEY": "Representation of the Control key used in keyboard shortcuts.", + "COMMAND_KEY": "Representation of the Mac Command key used in keyboard shortcuts.", + "OPTION_KEY": "Representation of the Mac Option key used in keyboard shortcuts.", + "ALT_KEY": "Representation of the Alt key used in keyboard shortcuts.", + "CUT_SHORTCUT": "menu label - Contextual menu item that cuts the focused item.", + "COPY_SHORTCUT": "menu label - Contextual menu item that copies the focused item.", + "PASTE_SHORTCUT": "menu label - Contextual menu item that pastes the previously copied item.", + "HELP_PROMPT": "Alert message shown to prompt users to review available keyboard shortcuts." } diff --git a/msg/messages.js b/msg/messages.js index 6b9d663a6..b9a68d957 100644 --- a/msg/messages.js +++ b/msg/messages.js @@ -1614,3 +1614,110 @@ Blockly.Msg.DIALOG_OK = 'OK'; /** @type {string} */ /// 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'; +/** @type {string} */ +/// menu label - Contextual menu item that starts a keyboard-driven block move. +Blockly.Msg.MOVE_BLOCK = 'Move Block (%1)'; +/** @type {string} */ +/// Name of the Microsoft Windows operating system displayed in a list of +/// keyboard shortcuts. +Blockly.Msg.WINDOWS = 'Windows'; +/** @type {string} */ +/// Name of the Apple macOS operating system displayed in a list of keyboard +/// shortcuts, +Blockly.Msg.MAC_OS = 'macOS'; +/** @type {string} */ +/// Name of the Google ChromeOS operating system displayed in a list of keyboard +/// shortcuts. +Blockly.Msg.CHROME_OS = 'ChromeOS'; +/** @type {string} */ +/// Name of the GNU/Linux operating system displayed in a list of keyboard +/// shortcuts. +Blockly.Msg.LINUX = 'Linux'; +/** @type {string} */ +/// Placeholder name for an operating system that can't be identified in a list +/// of keyboard shortcuts. +Blockly.Msg.UNKNOWN = 'Unknown'; +/** @type {string} */ +/// Representation of the Control key used in keyboard shortcuts. +Blockly.Msg.CONTROL_KEY = 'Ctrl'; +/** @type {string} */ +/// Representation of the Mac Command key used in keyboard shortcuts. +Blockly.Msg.COMMAND_KEY = '⌘ Command'; +/** @type {string} */ +/// Representation of the Mac Option key used in keyboard shortcuts. +Blockly.Msg.OPTION_KEY = '⌥ Option'; +/** @type {string} */ +/// Representation of the Alt key used in keyboard shortcuts. +Blockly.Msg.ALT_KEY = 'Alt'; +/** @type {string} */ +/// menu label - Contextual menu item that cuts the focused item. +Blockly.Msg.CUT_SHORTCUT = 'Cut (%1)'; +/** @type {string} */ +/// menu label - Contextual menu item that copies the focused item. +Blockly.Msg.COPY_SHORTCUT = 'Copy (%1)'; +/** @type {string} */ +/// menu label - Contextual menu item that pastes the previously copied item. +Blockly.Msg.PASTE_SHORTCUT = 'Paste (%1)'; +/** @type {string} */ +/// Alert message shown to prompt users to review available keyboard shortcuts. +Blockly.Msg.HELP_PROMPT = 'Press %1 for help on keyboard controls'; \ No newline at end of file