@eclipse-glsp/client 2.4.0-next.415 → 2.4.0-next.416

package/src/base/messages.json

@@ -0,0 +1,82 @@
+{
+  "navigation": {
+    "default_navigation_mode_activated": "Navigation On: Use arrow keys to select preceding (←) or succeding (→) elements. Use the up (↑) and down (↓) arrows to navigate paths. Press 'N' to exit.",
+    "default_navigation_mode_deactivated": "Navigation Off: Press 'N' for default navigation, 'ALT+N' for position based navigation.",
+    "local_navigation_mode_activated": "Position based Nav On: Navigate nearest elements using arrow keys: (↑) for above, (↓) for below, (←) for previous, (→) for next element. Press 'ALT+N' to exit.",
+    "local_navigation_mode_deactivated": "Position based Nav Off: Press 'N' for default navigation, 'ALT+N' for position based navigation.",
+    "shortcut_local_mode": "Activate local navigation mode",
+    "shortcut_global_mode": "Activate global navigation mode"
+  },
+  "focus": {
+    "focus_not_set": "Focus not set",
+    "focus_on": "Currently focused: ",
+    "focus_off": "Currently no element is focused.",
+    "focus_within": "Within",
+    "shortcut_focus_palette": "Focus on tool palette",
+    "shortcut_focus_graph": "Focus on graph"
+  },
+  "resize": {
+    "resize_mode_activated": "Resize On: Use plus(+) and minus(-) to resize, 'CTRL'+'0' for default size. Press 'ESC' to exit.",
+    "resize_mode_deactivated": "Resize Off: Press 'ALT'+'A' for resize mode.",
+    "shortcut_activate": "Activate resize mode for selected element",
+    "shortcut_deactivate": "Deactivate resize handler",
+    "shortcut_increase": "Increase size of element",
+    "shortcut_decrease": "Decrease size of element",
+    "shortcut_reset": "Set element size to default"
+  },
+  "move": {
+    "shortcut_move": "Move element"
+  },
+  "grid": {
+    "zoom_in_grid": "Select a digit from 1-9 to zoom in on the respective box.",
+    "shortcut_zoom_in": "Zoom in via grid"
+  },
+  "search": {
+    "shortcut_activate": "Activate search for elements",
+    "placeholder": "Search for elements...",
+    "label": "Search Field"
+  },
+  "tool_palette": {
+    "label": "Tool Palette",
+    "delete_button": "Enable deletion tool",
+    "marquee_button": "Enable marquee tool",
+    "marquee_message": "Currently marquee tool is only usable with mouse.",
+    "search_placeholder": "Search...",
+    "search_button": "Filter palette entries",
+    "selection_button": "Enable selection tool",
+    "validate_button": "Validate model",
+    "reset_viewport_button": "Reset Viewport",
+    "toggle_grid_button": "Toggle Grid",
+    "debug_mode_button": "Debug Mode",
+    "minimize": "Minimize palette",
+    "maximize": "Maximize palette",
+    "no_items": "No results found."
+  },
+  "viewport": {
+    "shortcut_move_viewport": "Move viewport",
+    "shortcut_zoom_viewport": "Zoom viewport",
+    "shortcut_zoom_element": "Zoom element"
+  },
+  "shortcut": {
+    "title": "Keyboard Shortcuts",
+    "header_command": "Command",
+    "header_shortcut": "Keybinding",
+    "menu_title": "Shortcut Menu",
+    "group_move": "Move",
+    "group_graph": "Graph",
+    "group_resize": "Resize",
+    "group_focus": "Focus",
+    "group_zoom": "Zoom",
+    "group_navigation": "Navigation",
+    "group_grid": "Grid",
+    "group_search": "Search",
+    "group_tool_palette": "Tool Palette",
+    "group_viewport": "Viewport"
+  },
+  "diagram": {
+    "label": "Diagram"
+  },
+  "autocomplete": {
+    "no_suggestions": "No suggestions available"
+  }
+}

package/src/base/messages.ts

@@ -0,0 +1,96 @@
+/********************************************************************************
+ * Copyright (c) 2025 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+import { Disposable, Emitter } from '@eclipse-glsp/sprotty';
+import * as rawMessages from './messages.json';
+
+// Helper type to allow dynamic properties inside nested objects with known keys
+type WithDynamicProperties<T> = T & Record<string, any>;
+
+type DynamicDeepPartial<T> = WithDynamicProperties<{
+    [K in keyof T]?: T[K] extends object ? DynamicDeepPartial<T[K]> : T[K];
+}>;
+
+const deepUpdate = (target: any, updates: any): void => {
+    for (const key in updates) {
+        // Guard against prototype pollution and block __proto__ and constructor
+        if (!Object.prototype.hasOwnProperty.call(updates, key) || key === '__proto__' || key === 'constructor') {
+            continue;
+        }
+
+        if (updates[key] && typeof updates[key] === 'object' && !Array.isArray(updates[key])) {
+            if (!target[key]) {
+                target[key] = {};
+            }
+            deepUpdate(target[key], updates[key]);
+        } else {
+            target[key] = updates[key];
+        }
+    }
+};
+
+/**
+ * Type-safe access to the known messages defined within the framework.
+ */
+export type Messages = WithDynamicProperties<{
+    [K in keyof typeof rawMessages]: (typeof rawMessages)[K] extends object
+        ? WithDynamicProperties<(typeof rawMessages)[K]>
+        : (typeof rawMessages)[K];
+}>;
+
+/**
+ * The messages object containing all known messages.
+ */
+export const messages: Messages = rawMessages;
+const messagesUpdatedEmitter = new Emitter<Messages>();
+/**
+ * Event that is fired when the messages are updated.
+ */
+export const onMessagesUpdated = messagesUpdatedEmitter.event;
+
+/**
+ * Update the messages with the given set of messages. This may include overwriting existing messages or adding new ones.
+ *
+ * @param updates The updates to apply to the messages object.
+ */
+export const updateMessages = (updates: DynamicDeepPartial<Messages>): void => {
+    deepUpdate(messages, updates);
+    messagesUpdatedEmitter.fire(messages);
+};
+
+/**
+ * Executes the given listener with the current messages and re-executes it whenever the messages are updated.
+ * If the listener returns a disposable, it will be disposed before the listener is called again.
+ *
+ * @param listener The listener to re-execute when the messages are updated.
+ * @param options Options to control the behavior of the listener execution.
+ * @returns A disposable that can be used to clean up the listener.
+ */
+export function repeatOnMessagesUpdated(
+    listener: (messages?: Messages) => unknown,
+    options: { initial: boolean } = { initial: true }
+): Disposable {
+    let cleanup = options.initial ? listener(messages) : {};
+
+    const updateListener = onMessagesUpdated(() => {
+        Disposable.dispose(cleanup);
+        cleanup = listener();
+    });
+
+    return Disposable.create(() => {
+        Disposable.dispose(cleanup);
+        updateListener.dispose();
+    });
+}

package/src/base/shortcuts/available-shortcuts-extension.ts

@@ -18,6 +18,7 @@ import { GModelRoot, matchesKeystroke, TYPES } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
 import { groupBy } from 'lodash';
 import { GLSPAbstractUIExtension } from '../../base/ui-extension/ui-extension';
+import { messages } from '../messages';
 import type { IShortcutManager, ShortcutRegistration } from './shortcuts-manager';
 
 @injectable()
@@ -71,8 +72,8 @@ export class AvailableShortcutsUIExtension extends GLSPAbstractUIExtension {
 
         commandCell.classList.add('column-title');
 
-        commandCell.innerText = 'Command';
-        keybindingCell.innerText = 'Keybinding';
+        commandCell.innerText = messages.shortcut.header_command;
+        keybindingCell.innerText = messages.shortcut.header_shortcut;
 
         headerRow.appendChild(commandCell);
         headerRow.appendChild(keybindingCell);
@@ -134,7 +135,7 @@ export class AvailableShortcutsUIExtension extends GLSPAbstractUIExtension {
         // create title
         const menuTitle = document.createElement('h3');
         menuTitle.classList.add('menu-header');
-        menuTitle.innerText = 'Keyboard Shortcuts';
+        menuTitle.innerText = messages.shortcut.title;
         this.container.appendChild(menuTitle);
 
         const closeBtn = document.createElement('button');
@@ -158,7 +159,7 @@ export class AvailableShortcutsUIExtension extends GLSPAbstractUIExtension {
 
         this.container.appendChild(this.shortcutsContainer);
         containerElement.appendChild(this.container);
-        containerElement.ariaLabel = 'Shortcut-Menu';
+        containerElement.ariaLabel = messages.shortcut.menu_title;
 
         this.refreshUI();
     }

package/src/features/accessibility/element-navigation/diagram-navigation-tool.ts

@@ -30,6 +30,7 @@ import {
     toArray
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
+import { messages, repeatOnMessagesUpdated } from '../../../base/messages';
 import { AvailableShortcutsTool } from '../../../base/shortcuts/available-shortcuts-tool';
 import type { IShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
 import { EnableDefaultToolsAction, EnableToolsAction } from '../../../base/tool-manager/tool';
@@ -38,7 +39,6 @@ import { SelectableBoundsAware } from '../../../utils/gmodel-util';
 import { BaseTool } from '../../tools/base-tools';
 import { RepositionAction } from '../../viewport/reposition';
 import { SearchAutocompletePaletteTool } from '../search/search-tool';
-import * as messages from '../toast/messages.json';
 import { ShowToastMessageAction } from '../toast/toast-handler';
 import { ElementNavigator } from './element-navigator';
 
@@ -60,10 +60,22 @@ export class ElementNavigatorTool extends BaseTool {
     enable(): void {
         this.toDisposeOnDisable.push(
             this.keyTool.registerListener(this.elementNavigatorKeyListener),
-            this.shortcutManager.register(ElementNavigatorTool.TOKEN, [
-                { shortcuts: ['ALT', 'N'], description: 'Activate local navigation mode', group: 'Navigation', position: 0 },
-                { shortcuts: ['N'], description: 'Activate global navigation mode', group: 'Navigation', position: 1 }
-            ])
+            repeatOnMessagesUpdated(() =>
+                this.shortcutManager.register(ElementNavigatorTool.TOKEN, [
+                    {
+                        shortcuts: ['ALT', 'N'],
+                        description: messages.navigation.shortcut_local_mode,
+                        group: messages.shortcut.group_navigation,
+                        position: 0
+                    },
+                    {
+                        shortcuts: ['N'],
+                        description: messages.navigation.shortcut_global_mode,
+                        group: messages.shortcut.group_navigation,
+                        position: 1
+                    }
+                ])
+            )
         );
     }
 }

package/src/features/accessibility/focus-tracker/focus-tracker-tool.ts

@@ -16,8 +16,8 @@
 
 import { IActionDispatcher, TYPES, ViewerOptions } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
+import { messages } from '../../../base/messages';
 import { Tool } from '../../../base/tool-manager/tool';
-import * as messages from '../toast/messages.json';
 import { ShowToastMessageAction } from '../toast/toast-handler';
 
 @injectable()
@@ -51,7 +51,7 @@ export class FocusTrackerTool implements Tool {
     }
 
     protected async focusOut(event: FocusEvent): Promise<void> {
-        await this.showToast('Focus not set');
+        await this.showToast(messages.focus.focus_not_set);
     }
 
     protected async focusIn(event: FocusEvent): Promise<void> {
@@ -68,7 +68,7 @@ export class FocusTrackerTool implements Tool {
                 if (parent === undefined && textMessage !== undefined) {
                     message = textMessage;
                 } else if (parent !== undefined && textMessage === undefined) {
-                    message = `Focus is in ${parent.ariaLabel}`;
+                    message = `${messages.focus.focus_within} ${parent.ariaLabel}`;
                 } else if (parent !== undefined && textMessage !== undefined) {
                     message = `${parent.ariaLabel} -> ${textMessage}`;
                 }

package/src/features/accessibility/global-keylistener-tool.ts

@@ -15,6 +15,7 @@
  ********************************************************************************/
 import { Action, matchesKeystroke, SetUIExtensionVisibilityAction, TYPES } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
+import { messages, repeatOnMessagesUpdated } from '../../base/messages';
 import type { IShortcutManager } from '../../base/shortcuts/shortcuts-manager';
 import { KeyboardGridMetadata, KeyboardNodeGridMetadata } from '../accessibility/keyboard-grid/constants';
 import { ToolPalette } from '../tool-palette/tool-palette';
@@ -41,10 +42,22 @@ export class GlobalKeyListenerTool extends BaseEditTool {
             this.alreadyRegistered = true;
             document.addEventListener('keyup', this.trigger.bind(this));
 
-            this.shortcutManager.register(GlobalKeyListenerTool.TOKEN, [
-                { shortcuts: ['ALT', 'P'], description: 'Focus on tool palette', group: 'Tool-Palette', position: 0 },
-                { shortcuts: ['ALT', 'G'], description: 'Focus on graph', group: 'Graph', position: 0 }
-            ]);
+            repeatOnMessagesUpdated(() =>
+                this.shortcutManager.register(GlobalKeyListenerTool.TOKEN, [
+                    {
+                        shortcuts: ['ALT', 'P'],
+                        description: messages.focus.shortcut_focus_palette,
+                        group: messages.shortcut.group_tool_palette,
+                        position: 0
+                    },
+                    {
+                        shortcuts: ['ALT', 'G'],
+                        description: messages.focus.shortcut_focus_graph,
+                        group: messages.shortcut.group_graph,
+                        position: 0
+                    }
+                ])
+            );
         }
     }
 

package/src/features/accessibility/keyboard-tool-palette/keyboard-tool-palette.ts

@@ -26,28 +26,18 @@ import {
     TriggerNodeCreationAction
 } from '@eclipse-glsp/sprotty';
 import { injectable } from 'inversify';
+import { messages } from '../../../base/messages';
 import { EnableDefaultToolsAction, EnableToolsAction } from '../../../base/tool-manager/tool';
-import {
-    changeCodiconClass,
-    compare,
-    createIcon,
-    createToolGroup,
-    EnableToolPaletteAction,
-    ToolPalette
-} from '../../tool-palette/tool-palette';
+import { compare, createIcon, createToolGroup, EnableToolPaletteAction, ToolPalette } from '../../tool-palette/tool-palette';
 import { MouseDeleteTool } from '../../tools/deletion/delete-tool';
 import { MarqueeMouseTool } from '../../tools/marquee-selection/marquee-mouse-tool';
 import { FocusDomAction } from '../actions';
 import { EdgeAutocompletePaletteMetadata } from '../edge-autocomplete/edge-autocomplete-palette';
 import { ElementNavigatorKeyListener } from '../element-navigation/diagram-navigation-tool';
 import { KeyboardNodeGridMetadata } from '../keyboard-grid/constants';
-import * as messages from '../toast/messages.json';
 import { ShowToastMessageAction } from '../toast/toast-handler';
 
 const SEARCH_ICON_ID = 'search';
-const PALETTE_ICON_ID = 'tools';
-const CHEVRON_DOWN_ICON_ID = 'chevron-right';
-const PALETTE_HEIGHT = '500px';
 const SELECTION_TOOL_KEY: KeyCode[] = ['Digit1', 'Numpad1'];
 const DELETION_TOOL_KEY: KeyCode[] = ['Digit2', 'Numpad2'];
 const MARQUEE_TOOL_KEY: KeyCode[] = ['Digit3', 'Numpad3'];
@@ -103,9 +93,10 @@ export class KeyboardToolPalette extends ToolPalette {
     }
 
     protected override initializeContents(_containerElement: HTMLElement): void {
-        this.containerElement.setAttribute('aria-label', 'Tool Palette');
+        this.containerElement.setAttribute('aria-label', messages.tool_palette.label);
         this.containerElement.tabIndex = 20;
         this.containerElement.classList.add('accessibility-tool-palette');
+        this.addMinimizePaletteButton();
         this.createHeader();
         this.createBody();
         this.lastActiveButton = this.defaultToolsButton;
@@ -147,31 +138,6 @@ export class KeyboardToolPalette extends ToolPalette {
         }
     }
 
-    protected override addMinimizePaletteButton(): void {
-        const baseDiv = document.getElementById(this.options.baseDiv);
-        const minPaletteDiv = document.createElement('div');
-        minPaletteDiv.classList.add('minimize-palette-button');
-        this.containerElement.classList.add('collapsible-palette');
-        if (baseDiv) {
-            const insertedDiv = baseDiv.insertBefore(minPaletteDiv, baseDiv.firstChild);
-            const minimizeIcon = createIcon(CHEVRON_DOWN_ICON_ID);
-            this.updateMinimizePaletteButtonTooltip(minPaletteDiv);
-            minimizeIcon.onclick = _event => {
-                if (this.isPaletteMaximized()) {
-                    this.containerElement.style.overflow = 'hidden';
-                    this.containerElement.style.maxHeight = '0px';
-                } else {
-                    this.containerElement.style.overflow = 'visible';
-                    this.containerElement.style.maxHeight = PALETTE_HEIGHT;
-                }
-                this.updateMinimizePaletteButtonTooltip(minPaletteDiv);
-                changeCodiconClass(minimizeIcon, PALETTE_ICON_ID);
-                changeCodiconClass(minimizeIcon, CHEVRON_DOWN_ICON_ID);
-            };
-            insertedDiv.appendChild(minimizeIcon);
-        }
-    }
-
     protected override createBody(): void {
         const bodyDiv = document.createElement('div');
         bodyDiv.classList.add('palette-body');
@@ -199,11 +165,11 @@ export class KeyboardToolPalette extends ToolPalette {
 
         if (this.paletteItems.length === 0) {
             const noResultsDiv = document.createElement('div');
-            noResultsDiv.innerText = 'No results found.';
+            noResultsDiv.innerText = messages.tool_palette.no_items;
             noResultsDiv.classList.add('tool-button');
             bodyDiv.appendChild(noResultsDiv);
         }
-        // Remove existing body to refresh filtered entries
+        // Replace existing body to refresh filtered entries
         if (this.bodyDiv) {
             this.containerElement.removeChild(this.bodyDiv);
         }
@@ -261,7 +227,7 @@ export class KeyboardToolPalette extends ToolPalette {
     protected override createDefaultToolButton(): HTMLElement {
         const button = createIcon('inspect');
         button.id = 'btn_default_tools';
-        button.title = 'Enable selection tool';
+        button.title = messages.tool_palette.selection_button;
         button.onclick = this.onClickStaticToolButton(button);
         button.appendChild(this.createKeyboardShotcut(SELECTION_TOOL_KEY[0]));
 
@@ -270,7 +236,7 @@ export class KeyboardToolPalette extends ToolPalette {
 
     protected override createMouseDeleteToolButton(): HTMLElement {
         const deleteToolButton = createIcon('chrome-close');
-        deleteToolButton.title = 'Enable deletion tool';
+        deleteToolButton.title = messages.tool_palette.delete_button;
         deleteToolButton.onclick = this.onClickStaticToolButton(deleteToolButton, MouseDeleteTool.ID);
         deleteToolButton.appendChild(this.createKeyboardShotcut(DELETION_TOOL_KEY[0]));
 
@@ -279,10 +245,10 @@ export class KeyboardToolPalette extends ToolPalette {
 
     protected override createMarqueeToolButton(): HTMLElement {
         const marqueeToolButton = createIcon('screen-full');
-        marqueeToolButton.title = 'Enable marquee tool';
+        marqueeToolButton.title = messages.tool_palette.marquee_button;
         const toastMessageAction = ShowToastMessageAction.createWithTimeout({
             id: Symbol.for(ElementNavigatorKeyListener.name),
-            message: messages.tool_palette.marqueeTool
+            message: messages.tool_palette.marquee_message
         });
         marqueeToolButton.onclick = this.onClickStaticToolButton(marqueeToolButton, MarqueeMouseTool.ID, toastMessageAction);
         marqueeToolButton.appendChild(this.createKeyboardShotcut(MARQUEE_TOOL_KEY[0]));
@@ -292,7 +258,7 @@ export class KeyboardToolPalette extends ToolPalette {
 
     protected override createValidateButton(): HTMLElement {
         const validateToolButton = createIcon('pass');
-        validateToolButton.title = 'Validate model';
+        validateToolButton.title = messages.tool_palette.validate_button;
         validateToolButton.onclick = _event => {
             const modelIds: string[] = [this.modelRootId];
             this.actionDispatcher.dispatch(RequestMarkersAction.create(modelIds));
@@ -330,7 +296,7 @@ export class KeyboardToolPalette extends ToolPalette {
             }
         };
         searchIcon.classList.add('search-icon');
-        searchIcon.title = 'Filter palette entries';
+        searchIcon.title = messages.tool_palette.search_button;
         searchIcon.appendChild(this.createKeyboardShotcut(SEARCH_TOOL_KEY[0]));
 
         return searchIcon;
@@ -342,7 +308,7 @@ export class KeyboardToolPalette extends ToolPalette {
         searchField.tabIndex = 21;
         searchField.id = this.containerElement.id + '_search_field';
         searchField.type = 'text';
-        searchField.placeholder = 'Search...';
+        searchField.placeholder = messages.tool_palette.search_placeholder;
         searchField.style.display = 'none';
         searchField.onkeyup = ev => {
             this.requestFilterUpdate(this.searchField.value);

package/src/features/accessibility/search/search-palette.ts

@@ -34,6 +34,7 @@ import { BaseAutocompletePalette } from '../../../base/auto-complete/base-autoco
 
 import { AutocompleteSuggestion, IAutocompleteSuggestionProvider } from '../../../base/auto-complete/autocomplete-suggestion-providers';
 import { applyCssClasses, deleteCssClasses } from '../../../base/feedback/css-feedback';
+import { messages } from '../../../base/messages';
 import { RepositionAction } from '../../../features/viewport/reposition';
 import { GEdge } from '../../../model';
 
@@ -121,8 +122,8 @@ export class SearchAutocompletePalette extends BaseAutocompletePalette {
     protected override initializeContents(containerElement: HTMLElement): void {
         super.initializeContents(containerElement);
 
-        this.autocompleteWidget.inputField.placeholder = 'Search for elements';
-        containerElement.setAttribute('aria-label', 'Search Field');
+        this.autocompleteWidget.inputField.placeholder = messages.search.placeholder;
+        containerElement.setAttribute('aria-label', messages.search.label);
     }
     protected getSuggestionProviders(root: Readonly<GModelRoot>, input: string): IAutocompleteSuggestionProvider[] {
         return [

package/src/features/accessibility/search/search-tool.ts

@@ -16,6 +16,7 @@
 
 import { Action, GModelElement, KeyListener, matchesKeystroke, SetUIExtensionVisibilityAction, TYPES } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
+import { messages, repeatOnMessagesUpdated } from '../../../base/messages';
 import type { IShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
 import { BaseTool } from '../../tools/base-tools';
 import { SearchAutocompletePalette } from './search-palette';
@@ -36,9 +37,16 @@ export class SearchAutocompletePaletteTool extends BaseTool {
     enable(): void {
         this.toDisposeOnDisable.push(
             this.keyTool.registerListener(this.keyListener),
-            this.shortcutManager.register(SearchAutocompletePaletteTool.TOKEN, [
-                { shortcuts: ['CTRL', 'F'], description: 'Activate search for elements', group: 'Search', position: 0 }
-            ])
+            repeatOnMessagesUpdated(() =>
+                this.shortcutManager.register(SearchAutocompletePaletteTool.TOKEN, [
+                    {
+                        shortcuts: ['CTRL', 'F'],
+                        description: messages.search.shortcut_activate,
+                        group: messages.shortcut.group_search,
+                        position: 0
+                    }
+                ])
+            )
         );
     }
 }

package/src/features/accessibility/view-key-tools/grid-cell-zoom-key-tool.ts

@@ -28,6 +28,7 @@ import {
     matchesKeystroke
 } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
+import { messages, repeatOnMessagesUpdated } from '../../../base/messages';
 import { SelectionService } from '../../../base/selection-service';
 import type { IShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
 import { getAbsolutePositionByPoint } from '../../../utils/viewpoint-util';
@@ -35,7 +36,6 @@ import { BaseTool } from '../../tools/base-tools';
 import type { ZoomFactors } from '../../viewport/zoom-viewport-action';
 import { ElementNavigatorKeyListener } from '../element-navigation/diagram-navigation-tool';
 import { EnableKeyboardGridAction, KeyboardGridCellSelectedAction, KeyboardGridKeyboardEventAction } from '../keyboard-grid/action';
-import * as messages from '../toast/messages.json';
 import { HideToastAction, ShowToastMessageAction } from '../toast/toast-handler';
 
 /**
@@ -59,9 +59,16 @@ export class GridCellZoomTool extends BaseTool {
     enable(): void {
         this.toDisposeOnDisable.push(
             this.keyTool.registerListener(this.zoomKeyListener),
-            this.shortcutManager.register(GridCellZoomTool.TOKEN, [
-                { shortcuts: ['CTRL', '+'], description: 'Zoom in via Grid', group: 'Zoom', position: 0 }
-            ])
+            repeatOnMessagesUpdated(() =>
+                this.shortcutManager.register(GridCellZoomTool.TOKEN, [
+                    {
+                        shortcuts: ['CTRL', '+'],
+                        description: messages.grid.shortcut_zoom_in,
+                        group: messages.shortcut.group_zoom,
+                        position: 0
+                    }
+                ])
+            )
         );
     }
 

package/src/features/change-bounds/resize/resize-default-tool.ts

@@ -16,6 +16,7 @@
 
 import { KeyListener, matchesKeystroke, TYPES, type Action, type GModelElement, type IActionDispatcher } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
+import { messages, repeatOnMessagesUpdated } from '../../../base/messages';
 import { SelectionService } from '../../../base/selection-service';
 import type { ShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
 import { EnableToolsAction } from '../../../base/tool-manager/tool';
@@ -67,9 +68,16 @@ export class DefaultResizeKeyTool extends BaseEditTool {
     enable(): void {
         this.toDisposeOnDisable.push(
             this.keyTool.registerListener(this.keyListener),
-            this.shortcutManager.register(DefaultResizeKeyTool.TOKEN, [
-                { shortcuts: ['ALT', 'A'], description: 'Activate resize mode for selected element', group: 'Resize', position: 0 }
-            ])
+            repeatOnMessagesUpdated(() =>
+                this.shortcutManager.register(DefaultResizeKeyTool.TOKEN, [
+                    {
+                        shortcuts: ['ALT', 'A'],
+                        description: messages.resize.shortcut_activate,
+                        group: messages.shortcut.group_resize,
+                        position: 0
+                    }
+                ])
+            )
         );
     }
 }

package/src/features/change-bounds/resize/resize-tool.ts

@@ -17,9 +17,9 @@
 import { KeyListener, matchesKeystroke, TYPES, type Action, type GModelElement } from '@eclipse-glsp/sprotty';
 import { inject, injectable } from 'inversify';
 import { Disposable } from 'vscode-jsonrpc';
+import { messages, repeatOnMessagesUpdated } from '../../../base/messages';
 import { SelectionService } from '../../../base/selection-service';
 import type { ShortcutManager } from '../../../base/shortcuts/shortcuts-manager';
-import * as messages from '../../accessibility/toast/messages.json';
 import { ShowToastMessageAction } from '../../accessibility/toast/toast-handler';
 import { BaseEditTool } from '../../tools/base-tools';
 import { isResizable } from '../model';
@@ -100,12 +100,34 @@ export class ResizeKeyTool extends BaseEditTool {
 
         this.toDisposeOnDisable.push(
             this.keyTool.registerListener(this.keyListener),
-            this.shortcutManager.register(ResizeKeyTool.TOKEN, [
-                { shortcuts: ['Escape'], description: 'Deactivate resize handler ', group: 'Resize', position: 0 },
-                { shortcuts: ['+'], description: 'Increase size of element', group: 'Resize', position: 1 },
-                { shortcuts: ['-'], description: 'Increase size of element', group: 'Resize', position: 2 },
-                { shortcuts: ['CTRL', '0'], description: 'Set element size to default', group: 'Resize', position: 3 }
-            ]),
+            repeatOnMessagesUpdated(() =>
+                this.shortcutManager.register(ResizeKeyTool.TOKEN, [
+                    {
+                        shortcuts: ['Escape'],
+                        description: messages.resize.shortcut_deactivate,
+                        group: messages.shortcut.group_resize,
+                        position: 0
+                    },
+                    {
+                        shortcuts: ['+'],
+                        description: messages.resize.shortcut_increase,
+                        group: messages.shortcut.group_resize,
+                        position: 1
+                    },
+                    {
+                        shortcuts: ['-'],
+                        description: messages.resize.shortcut_decrease,
+                        group: messages.shortcut.group_resize,
+                        position: 2
+                    },
+                    {
+                        shortcuts: ['CTRL', '0'],
+                        description: messages.resize.shortcut_reset,
+                        group: messages.shortcut.group_resize,
+                        position: 3
+                    }
+                ])
+            ),
             Disposable.create(() => {
                 this.dispatchActions(this.keyListener.disable());
             })