scratch-blocks 2.1.19 → 2.1.21

package/dist/types/src/index.d.ts

@@ -43,7 +43,7 @@ import * as ScratchVariables from './variables';
 export * from 'blockly/core';
 export * from './block_reporting';
 export * from './procedures';
-export * from '../msg/scratch_msgs.js';
+export * from './scratch_msgs';
 export * from './constants';
 export { glowStack };
 export { scratchBlocksUtils };

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,iBAAiB,CAAA;AACxB,OAAO,kBAAkB,CAAA;AACzB,OAAO,eAAe,CAAA;AACtB,OAAO,gBAAgB,CAAA;AACvB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,iBAAiB,CAAA;AACxB,OAAO,iBAAiB,CAAA;AACxB,OAAO,eAAe,CAAA;AACtB,OAAO,oBAAoB,CAAA;AAC3B,OAAO,qBAAqB,CAAA;AAC5B,OAAO,kBAAkB,CAAA;AACzB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,8BAA8B,CAAA;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAA;AACxD,OAAO,OAAO,CAAA;AACd,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wCAAwC,CAAA;AAC/C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,oCAAoC,CAAA;AAC3C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,yCAAyC,CAAA;AAChD,OAAO,EAA6B,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAE3F,OAAO,EAAqB,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQlE,OAAO,wBAAwB,CAAA;AAC/B,OAAO,EAAmB,SAAS,EAAE,MAAM,SAAS,CAAA;AAEpD,OAAO,yBAAyB,CAAA;AAChC,OAAO,qBAAqB,CAAA;AAE5B,OAAO,KAAK,kBAAkB,MAAM,wBAAwB,CAAA;AAC5D,OAAO,wBAAwB,CAAA;AAC/B,OAAO,wBAAwB,CAAA;AAC/B,OAAO,8BAA8B,CAAA;AAGrC,OAAO,mBAAmB,CAAA;AAC1B,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wBAAwB,CAAA;AAC/B,OAAO,0BAA0B,CAAA;AAGjC,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAA;AAE/C,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,wBAAwB,CAAA;AACtC,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,SAAS,EAAE,CAAA;AACpB,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC7B,OAAO,EAAE,yBAAyB,EAAE,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAClF,cAAc,OAAO,CAAA;AAErB,UAAU,oBAAqB,SAAQ,OAAO,CAAC,cAAc;IAC3D;;;OAGG;IACH,YAAY,CAAC,EAAE,kBAAkB,CAAA;CAClC;AASD,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,wBAkDvE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,iBAAiB,CAAA;AACxB,OAAO,kBAAkB,CAAA;AACzB,OAAO,eAAe,CAAA;AACtB,OAAO,gBAAgB,CAAA;AACvB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,iBAAiB,CAAA;AACxB,OAAO,iBAAiB,CAAA;AACxB,OAAO,eAAe,CAAA;AACtB,OAAO,oBAAoB,CAAA;AAC3B,OAAO,qBAAqB,CAAA;AAC5B,OAAO,kBAAkB,CAAA;AACzB,OAAO,gBAAgB,CAAA;AACvB,OAAO,eAAe,CAAA;AACtB,OAAO,8BAA8B,CAAA;AACrC,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAA;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAChD,OAAO,KAAK,gBAAgB,MAAM,sBAAsB,CAAA;AACxD,OAAO,OAAO,CAAA;AACd,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wCAAwC,CAAA;AAC/C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,oCAAoC,CAAA;AAC3C,OAAO,sCAAsC,CAAA;AAC7C,OAAO,yCAAyC,CAAA;AAChD,OAAO,EAA6B,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAE3F,OAAO,EAAqB,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAQlE,OAAO,wBAAwB,CAAA;AAC/B,OAAO,EAAmB,SAAS,EAAE,MAAM,SAAS,CAAA;AAEpD,OAAO,yBAAyB,CAAA;AAChC,OAAO,qBAAqB,CAAA;AAE5B,OAAO,KAAK,kBAAkB,MAAM,wBAAwB,CAAA;AAC5D,OAAO,wBAAwB,CAAA;AAC/B,OAAO,wBAAwB,CAAA;AAC/B,OAAO,8BAA8B,CAAA;AAGrC,OAAO,mBAAmB,CAAA;AAC1B,OAAO,sCAAsC,CAAA;AAC7C,OAAO,wBAAwB,CAAA;AAC/B,OAAO,0BAA0B,CAAA;AAGjC,OAAO,KAAK,gBAAgB,MAAM,aAAa,CAAA;AAE/C,cAAc,cAAc,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,cAAc,CAAA;AAC5B,cAAc,gBAAgB,CAAA;AAC9B,cAAc,aAAa,CAAA;AAC3B,OAAO,EAAE,SAAS,EAAE,CAAA;AACpB,OAAO,EAAE,kBAAkB,EAAE,CAAA;AAC7B,OAAO,EAAE,yBAAyB,EAAE,CAAA;AACpC,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAC3B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAA;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAC7D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAClF,cAAc,OAAO,CAAA;AAErB,UAAU,oBAAqB,SAAQ,OAAO,CAAC,cAAc;IAC3D;;;OAGG;IACH,YAAY,CAAC,EAAE,kBAAkB,CAAA;CAClC;AASD,wBAAgB,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,wBAkDvE;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,IAAI,OAAO,CAE9C"}

package/dist/types/src/renderer/renderer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../../src/renderer/renderer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,OAAO,CAAC,KAAK,CAAC,QAAQ;IACzD;;;;OAIG;IACM,YAAY,IAAI,MAAM;IAI/B;;;;;;OAMG;IACM,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM;IAI9F;;;;OAIG;IACM,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,GAAG,UAAU;IAI7D;;;OAGG;IACM,cAAc,IAAI,gBAAgB;IAI3C;;;;;OAKG;IACM,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,UAAU;IAItF;;;;OAIG;IACM,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO;CAGpF"}
+{"version":3,"file":"renderer.d.ts","sourceRoot":"","sources":["../../../../src/renderer/renderer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAE1C;;GAEG;AACH,qBAAa,eAAgB,SAAQ,OAAO,CAAC,KAAK,CAAC,QAAQ;IACzD;;;;OAIG;IACM,YAAY,IAAI,MAAM;IAI/B;;;;;;OAMG;IACM,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM;IAI9F;;;;OAIG;IACM,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,GAAG,UAAU;IAI7D;;;OAGG;IACM,cAAc,IAAI,gBAAgB;IAI3C;;;;;OAKG;IACM,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,UAAU;IAItF;;;;OAIG;IACM,yBAAyB,CAAC,UAAU,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO;CAIpF"}

package/dist/types/src/scratch_msgs.d.ts

@@ -0,0 +1,32 @@
+import en from '../msg/json/en.json';
+type Messages = Record<string, string>;
+/** A message key defined in this repository's English source. */
+export type ScratchMessageKey = keyof typeof en;
+/**
+ * Localized strings for Scratch blocks and workspace UI.
+ *
+ * English comes from this repository's `msg/json/en.json`, so new strings are usable before they are translated.
+ * Every other locale comes from scratch-l10n, which pulls reviewed translations from Transifex.
+ */
+export declare class ScratchMsgs {
+    static currentLocale_: string;
+    static locales: Record<string, Messages>;
+    /**
+     * Apply a locale's messages to `Blockly.Msg`.
+     * @param locale A key of `ScratchMsgs.locales`, such as `'de'` or `'pt-br'`.
+     */
+    static setLocale(locale: string): void;
+    /**
+     * Look up a message without changing the current locale.
+     * @param msgId The message key.
+     * @param defaultMsg Returned when the locale has no translation for `msgId`.
+     * @param useLocale The locale to use instead of the current one.
+     * @returns The translation, else `defaultMsg`, else the English message.
+     */
+    static translate(msgId: ScratchMessageKey, defaultMsg?: string, useLocale?: string): string;
+    static translate(msgId: string, defaultMsg: string, useLocale?: string): string;
+    static translate(msgId: string, defaultMsg?: string, useLocale?: string): string | undefined;
+    private static getLocaleMessages;
+}
+export {};
+//# sourceMappingURL=scratch_msgs.d.ts.map

package/dist/types/src/scratch_msgs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scratch_msgs.d.ts","sourceRoot":"","sources":["../../../src/scratch_msgs.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAEpC,KAAK,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAEtC,iEAAiE;AACjE,MAAM,MAAM,iBAAiB,GAAG,MAAM,OAAO,EAAE,CAAA;AAY/C;;;;;GAKG;AACH,qBAAa,WAAW;IACtB,MAAM,CAAC,cAAc,SAAO;IAC5B,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAwB;IAEhE;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAetC;;;;;;OAMG;IACH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,iBAAiB,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAC3F,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM;IAC/E,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAK5F,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAGjC"}

package/eslint.config.mjs

@@ -30,7 +30,6 @@ export default eslintConfigScratch.defineConfig(
     '*_uncompressed*.js',
     'msg/**',
     'core/css.js',
-    'i18n/**',
     'tests/jsunit/**',
     'tests/workspace_svg/**',
     'tests/blocks/**',

package/msg/json/en.json

@@ -245,12 +245,18 @@
   "DELETE_X_BLOCKS": "Delete %1 Blocks",
   "DELETE_ALL_BLOCKS": "Delete all %1 blocks?",
   "CLEAN_UP": "Clean up Blocks",
+  "COLLAPSE_BLOCK": "Collapse Block",
+  "EXPAND_BLOCK": "Expand Block",
+  "COLLAPSE_ALL": "Collapse Blocks",
+  "EXPAND_ALL": "Expand Blocks",
+  "COLLAPSED_WARNINGS_WARNING": "Collapsed blocks contain warnings.",
   "HELP": "Help",
   "UNDO": "Undo",
   "REDO": "Redo",
   "EDIT_PROCEDURE": "Edit",
   "SHOW_PROCEDURE_DEFINITION": "Go to definition",
   "WORKSPACE_COMMENT_DEFAULT_TEXT": "Say something...",
+  "WORKSPACE_ARIA_LABEL": "Code Area",
   "COLOUR_HUE_LABEL": "Color",
   "COLOUR_SATURATION_LABEL": "Saturation",
   "COLOUR_BRIGHTNESS_LABEL": "Brightness",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "scratch-blocks",
-  "version": "2.1.19",
+  "version": "2.1.21",
   "description": "Scratch Blocks is a library for building creative computing interfaces.",
   "author": "Massachusetts Institute of Technology",
   "license": "Apache-2.0",
@@ -21,6 +21,8 @@
   "scripts": {
     "build": "webpack --mode production",
     "format": "prettier --write . && eslint --fix",
+    "i18n:push": "tx-push-src scratch-editor blocks msg/json/en.json",
+    "i18n:src": "node scripts/validate-en-json.mjs",
     "prepare": "husky || true",
     "start": "webpack serve --open --mode development",
     "test": "vitest run",
@@ -36,24 +38,25 @@
     "blockly": "^12.4.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "20.5.0",
-    "@commitlint/config-conventional": "20.5.0",
-    "@vitest/browser": "4.1.5",
-    "@vitest/browser-playwright": "4.1.5",
-    "eslint": "9.39.4",
-    "eslint-config-scratch": "14.1.12",
+    "@commitlint/cli": "20.5.3",
+    "@commitlint/config-conventional": "20.5.3",
+    "@vitest/browser": "4.1.11",
+    "@vitest/browser-playwright": "4.1.11",
+    "eslint": "9.39.5",
+    "eslint-config-scratch": "14.1.81",
     "husky": "9.1.7",
-    "playwright": "1.59.1",
-    "prettier": "3.8.3",
+    "playwright": "1.63.0",
+    "prettier": "3.8.5",
+    "scratch-l10n": "6.1.119",
     "scratch-semantic-release-config": "4.0.1",
-    "semantic-release": "25.0.3",
+    "semantic-release": "25.0.9",
     "source-map-loader": "5.0.0",
-    "ts-loader": "9.5.7",
+    "ts-loader": "9.6.2",
     "typescript": "5.9.3",
-    "vitest": "4.1.5",
-    "webpack": "5.106.2",
+    "vitest": "4.1.11",
+    "webpack": "5.111.1",
     "webpack-cli": "6.0.1",
-    "webpack-dev-server": "5.2.3"
+    "webpack-dev-server": "5.2.6"
   },
   "config": {
     "commitizen": {

package/scripts/validate-en-json.mjs

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+/**
+ * Copyright 2026 Scratch Foundation
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Checks msg/json/en.json, the English source pushed to Transifex, before it is pushed.
+ */
+import console from 'node:console'
+import fs from 'node:fs'
+import process from 'node:process'
+import { URL, fileURLToPath } from 'node:url'
+
+const file = process.argv[2] ?? fileURLToPath(new URL('../msg/json/en.json', import.meta.url))
+
+const messages = JSON.parse(fs.readFileSync(file, 'utf8'))
+const errors = []
+for (const [key, value] of Object.entries(messages)) {
+  if (!/^[A-Z][A-Z0-9_]*$/.test(key)) errors.push(`${key}: key must be UPPER_SNAKE_CASE`)
+  if (typeof value !== 'string' || !value.trim()) errors.push(`${key}: value must be a non-empty string`)
+  else if (value.includes('\n')) errors.push(`${key}: value must not contain a newline`)
+}
+
+if (errors.length > 0) {
+  console.error(`${file}:\n  ${errors.join('\n  ')}`)
+  process.exit(1)
+}
+console.log(`${file}: ${Object.keys(messages).length} messages OK`)

package/src/fields/scratch_field_variable.ts

@@ -21,8 +21,8 @@
  * @author fraser@google.com (Neil Fraser)
  */
 import * as Blockly from 'blockly/core'
-import { ScratchMsgs } from '../../msg/scratch_msgs.js'
 import * as Constants from '../constants'
+import { ScratchMsgs } from '../scratch_msgs'
 import type { ScratchVariableModel } from '../scratch_variable_model'
 import { createVariable, renameVariable } from '../variables'
 
@@ -47,7 +47,7 @@ export class ScratchFieldVariable extends Blockly.FieldVariable {
     // dropdownCreate returns MenuOption[] rather than Blockly.MenuGenerator's
     // MenuOption[][] variant; the cast is needed to satisfy FieldVariable's
     // menuGenerator_ type while the actual runtime shape is compatible.
-    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate.bind(this) as unknown as Blockly.MenuGenerator
+    this.menuGenerator_ = ScratchFieldVariable.dropdownCreate.bind(this)
   }
 
   initModel() {

package/src/index.ts

@@ -63,7 +63,7 @@ import * as ScratchVariables from './variables'
 export * from 'blockly/core'
 export * from './block_reporting'
 export * from './procedures'
-export * from '../msg/scratch_msgs.js'
+export * from './scratch_msgs'
 export * from './constants'
 export { glowStack }
 export { scratchBlocksUtils }
@@ -159,7 +159,7 @@ export function isContentNodeFocused(): boolean {
   return Blockly.getFocusManager().getFocusedNode() !== null
 }
 
-;(registerContinuousToolbox as () => void)()
+registerContinuousToolbox()
 Blockly.Scrollbar.scrollbarThickness = Blockly.Touch.TOUCH_ENABLED ? 14 : 11
 Blockly.FlyoutButton.TEXT_MARGIN_X = 40
 Blockly.FlyoutButton.TEXT_MARGIN_Y = 10

package/src/renderer/constants.ts

@@ -52,7 +52,7 @@ export class ConstantProvider extends Blockly.zelos.ConstantProvider {
    * @returns The shape object for the given connection.
    */
   override shapeFor(connection: Blockly.RenderedConnection): ReturnType<Blockly.zelos.ConstantProvider['shapeFor']> {
-    const connectionType = connection.type as Blockly.ConnectionType
+    const connectionType: Blockly.ConnectionType = connection.type
     let checks = connection.getCheck()
     const hexagonal = this.HEXAGONAL
     const rounded = this.ROUNDED

package/src/renderer/drawer.ts

@@ -64,7 +64,7 @@ export class Drawer extends Blockly.zelos.Drawer {
    */
   override drawConnectionHighlightPath(measurable: Blockly.blockRendering.Connection) {
     const conn = measurable.connectionModel
-    const connectionType = conn.type as Blockly.ConnectionType
+    const connectionType: Blockly.ConnectionType = conn.type
     if (connectionType === Blockly.ConnectionType.INPUT_VALUE && measurable.isDynamicShape) {
       const input = measurable as Blockly.blockRendering.InlineInput
       const EXPAND_X = 0.5

package/src/renderer/renderer.ts

@@ -65,7 +65,8 @@ export class ScratchRenderer extends Blockly.zelos.Renderer {
    * @returns True if we should highlight the connection.
    */
   override shouldHighlightConnection(connection: Blockly.RenderedConnection): boolean {
-    return (connection.type as Blockly.ConnectionType) === Blockly.ConnectionType.INPUT_VALUE
+    const connectionType: Blockly.ConnectionType = connection.type
+    return connectionType === Blockly.ConnectionType.INPUT_VALUE
   }
 }
 

package/src/scratch_c_block_wrap.ts

@@ -28,7 +28,8 @@ Blockly.Connection.getConnectionForOrphanedConnection = function (
   // Apply the wrapping logic when the orphaned connection is a statement
   // connection (PREVIOUS_STATEMENT).  Value connections (OUTPUT_VALUE) are
   // already handled by the original implementation.
-  if ((orphanConnection.type as Blockly.ConnectionType) === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
+  const orphanType: Blockly.ConnectionType = orphanConnection.type
+  if (orphanType === Blockly.ConnectionType.PREVIOUS_STATEMENT) {
     const checker = orphanConnection.getConnectionChecker()
     for (const input of startBlock.inputList) {
       const conn = input.connection
@@ -87,7 +88,7 @@ Reflect.set(
     if (markerPreviousConnection?.isConnected() && !markerNextConnection?.isConnected()) {
       for (const input of marker.inputList) {
         const conn = input.connection
-        const connType = conn?.type as Blockly.ConnectionType | undefined
+        const connType = conn?.type
         if (connType !== Blockly.ConnectionType.NEXT_STATEMENT || !conn?.isConnected()) {
           continue
         }

package/src/scratch_comment_bubble.ts

@@ -69,7 +69,7 @@ export class ScratchCommentBubble
     if (gesture) {
       // ScratchCommentBubble implements IBubble structurally but TypeScript
       // cannot verify it because IBubble.drag has a different signature here.
-      gesture.handleBubbleStart(e, this as unknown as Blockly.IBubble)
+      gesture.handleBubbleStart(e, this)
       Blockly.common.setSelected(this)
     }
   }

package/src/scratch_connection_checker.ts

@@ -50,8 +50,9 @@ class ScratchConnectionChecker extends Blockly.ConnectionChecker {
     // getConnectionForOrphanedConnection patch routes displaced blocks into
     // statement inputs, so we allow the connection when a suitable statement
     // input exists on the dragging block.
+    const bType: Blockly.ConnectionType = b.type
     if (
-      (b.type as Blockly.ConnectionType) === Blockly.ConnectionType.NEXT_STATEMENT &&
+      bType === Blockly.ConnectionType.NEXT_STATEMENT &&
       b.isConnected() &&
       !(a.getSourceBlock() as Blockly.Block).nextConnection
     ) {

package/src/scratch_msgs.ts

@@ -0,0 +1,70 @@
+/**
+ * Copyright 2026 Scratch Foundation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as Blockly from 'blockly/core'
+import blocksMsgs from 'scratch-l10n/locales/blocks-msgs.js'
+import en from '../msg/json/en.json'
+
+type Messages = Record<string, string>
+
+/** A message key defined in this repository's English source. */
+export type ScratchMessageKey = keyof typeof en
+
+/**
+ * Blockly core message keys that read the same text as a Scratch message, mapped to that Scratch key. Transifex
+ * holds the translation under the Scratch key.
+ */
+const BLOCKLY_ALIASES: Record<string, ScratchMessageKey> = {
+  // The Duplicate items in the block and workspace comment context menus.
+  DUPLICATE_BLOCK: 'DUPLICATE',
+  DUPLICATE_COMMENT: 'DUPLICATE',
+}
+
+/**
+ * Localized strings for Scratch blocks and workspace UI.
+ *
+ * English comes from this repository's `msg/json/en.json`, so new strings are usable before they are translated.
+ * Every other locale comes from scratch-l10n, which pulls reviewed translations from Transifex.
+ */
+export class ScratchMsgs {
+  static currentLocale_ = 'en'
+  static locales: Record<string, Messages> = { ...blocksMsgs, en }
+
+  /**
+   * Apply a locale's messages to `Blockly.Msg`.
+   * @param locale A key of `ScratchMsgs.locales`, such as `'de'` or `'pt-br'`.
+   */
+  static setLocale(locale: string): void {
+    const messages = this.getLocaleMessages(locale)
+    if (!messages) {
+      console.warn('Ignoring unrecognized locale: ' + locale)
+      return
+    }
+    this.currentLocale_ = locale
+    // Apply English first so any key this locale lacks falls back to English instead of keeping the previous
+    // locale's text.
+    Object.assign(Blockly.Msg, this.locales.en, messages)
+    for (const [blocklyKey, scratchKey] of Object.entries(BLOCKLY_ALIASES)) {
+      Blockly.Msg[blocklyKey] = Blockly.Msg[scratchKey]
+    }
+  }
+
+  /**
+   * Look up a message without changing the current locale.
+   * @param msgId The message key.
+   * @param defaultMsg Returned when the locale has no translation for `msgId`.
+   * @param useLocale The locale to use instead of the current one.
+   * @returns The translation, else `defaultMsg`, else the English message.
+   */
+  static translate(msgId: ScratchMessageKey, defaultMsg?: string, useLocale?: string): string
+  static translate(msgId: string, defaultMsg: string, useLocale?: string): string
+  static translate(msgId: string, defaultMsg?: string, useLocale?: string): string | undefined
+  static translate(msgId: string, defaultMsg?: string, useLocale?: string): string | undefined {
+    return this.getLocaleMessages(useLocale ?? this.currentLocale_)?.[msgId] ?? defaultMsg ?? this.locales.en[msgId]
+  }
+
+  private static getLocaleMessages(locale: string): Messages | undefined {
+    return Object.prototype.hasOwnProperty.call(this.locales, locale) ? this.locales[locale] : undefined
+  }
+}

package/tsconfig.json

@@ -7,6 +7,7 @@
     /* Modules */
     "module": "esnext",
     "moduleResolution": "bundler",
+    "resolveJsonModule": true,
 
     /* Emit */
     "declaration": true,

package/types/scratch-l10n.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Copyright 2026 Scratch Foundation
+ * SPDX-License-Identifier: Apache-2.0
+ */
+declare module 'scratch-l10n' {
+  /** The locales Scratch supports, keyed by locale code. */
+  const locales: Record<string, { name: string }>
+  export default locales
+}
+
+declare module 'scratch-l10n/locales/blocks-msgs.js' {
+  /** Reviewed block translations from Transifex, keyed by locale, then by message key. */
+  const blocksMsgs: Record<string, Record<string, string>>
+  export default blocksMsgs
+}

package/dist/types/msg/scratch_msgs.d.ts

@@ -1,9 +0,0 @@
-export class ScratchMsgs {
-    static currentLocale_: string;
-    static setLocale(locale: any): void;
-    static translate(msgId: any, defaultMsg: any, useLocale: any): any;
-}
-export namespace ScratchMsgs {
-    let locales: typeof locales;
-}
-//# sourceMappingURL=scratch_msgs.d.ts.map

package/dist/types/msg/scratch_msgs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"scratch_msgs.d.ts","sourceRoot":"","sources":["../../../msg/scratch_msgs.js"],"names":[],"mappings":"AAEA;IACE,8BAA4B;IAG5B,oCAQC;IAED,mEAUC;CACF"}

package/i18n/common.py

@@ -1,234 +0,0 @@
-#!/usr/bin/python
-
-# Code shared by translation conversion scripts.
-#
-# Copyright 2013 Google Inc.
-# https://developers.google.com/blockly/
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import codecs
-import json
-import os
-from datetime import datetime
-
-class InputError(Exception):
-    """Exception raised for errors in the input.
-
-    Attributes:
-        location -- where error occurred
-        msg -- explanation of the error
-
-    """
-
-    def __init__(self, location, msg):
-        Exception.__init__(self, '{0}: {1}'.format(location, msg))
-        self.location = location
-        self.msg = msg
-
-
-def read_json_file(filename):
-  """Read a JSON file as UTF-8 into a dictionary, discarding @metadata.
-
-  Args:
-    filename: The filename, which must end ".json".
-
-  Returns:
-    The dictionary.
-
-  Raises:
-    InputError: The filename did not end with ".json" or an error occurred
-        while opening or reading the file.
-  """
-  if not filename.endswith('.json'):
-    raise InputError(filename, 'filenames must end with ".json"')
-  try:
-    # Read in file.
-    with codecs.open(filename, 'r', 'utf-8') as infile:
-      defs = json.load(infile)
-    if '@metadata' in defs:
-      del defs['@metadata']
-    return defs
-  except ValueError as e:
-    print('Error reading ' + filename)
-    raise InputError(filename, str(e))
-
-
-def _create_qqq_file(output_dir):
-    """Creates a qqq.json file with message documentation for translatewiki.net.
-
-    The file consists of key-value pairs, where the keys are message ids and
-    the values are descriptions for the translators of the messages.
-    What documentation exists for the format can be found at:
-    http://translatewiki.net/wiki/Translating:Localisation_for_developers#Message_documentation
-
-    The file should be closed by _close_qqq_file().
-
-    Parameters:
-        output_dir: The output directory.
-
-    Returns:
-        A pointer to a file to which a left brace and newline have been written.
-
-    Raises:
-        IOError: An error occurred while opening or writing the file.
-    """
-    qqq_file_name = os.path.join(os.curdir, output_dir, 'qqq.json')
-    qqq_file = codecs.open(qqq_file_name, 'w', 'utf-8')
-    print('Created file: ' + qqq_file_name)
-    qqq_file.write('{\n')
-    return qqq_file
-
-
-def _close_qqq_file(qqq_file):
-    """Closes a qqq.json file created and opened by _create_qqq_file().
-
-    This writes the final newlines and right brace.
-
-    Args:
-        qqq_file: A file created by _create_qqq_file().
-
-    Raises:
-        IOError: An error occurred while writing to or closing the file.
-    """
-    qqq_file.write('\n}\n')
-    qqq_file.close()
-
-
-def _create_lang_file(author, lang, output_dir):
-    """Creates a <lang>.json file for translatewiki.net.
-
-    The file consists of metadata, followed by key-value pairs, where the keys
-    are message ids and the values are the messages in the language specified
-    by the corresponding command-line argument.  The file should be closed by
-    _close_lang_file().
-
-    Args:
-        author: Name and email address of contact for translators.
-        lang: ISO 639-1 source language code.
-        output_dir: Relative directory for output files.
-
-    Returns:
-        A pointer to a file to which the metadata has been written.
-
-    Raises:
-        IOError: An error occurred while opening or writing the file.
-    """
-    lang_file_name = os.path.join(os.curdir, output_dir, lang + '.json')
-    lang_file = codecs.open(lang_file_name, 'w', 'utf-8')
-    print('Created file: ' + lang_file_name)
-    # string.format doesn't like printing braces, so break up our writes.
-    lang_file.write('{\n\t"@metadata": {')
-    lang_file.write("""
-\t\t"author": "{0}",
-\t\t"lastupdated": "{1}",
-\t\t"locale": "{2}",
-\t\t"messagedocumentation" : "qqq"
-""".format(author, str(datetime.now()), lang))
-    lang_file.write('\t},\n')
-    return lang_file
-
-
-def _close_lang_file(lang_file):
-    """Closes a <lang>.json file created with _create_lang_file().
-
-    This also writes the terminating left brace and newline.
-
-    Args:
-        lang_file: A file opened with _create_lang_file().
-
-    Raises:
-        IOError: An error occurred while writing to or closing the file.
-    """
-    lang_file.write('\n}\n')
-    lang_file.close()
-
-
-def _create_key_file(output_dir):
-    """Creates a keys.json file mapping Closure keys to Blockly keys.
-
-    Args:
-        output_dir: Relative directory for output files.
-
-    Raises:
-        IOError: An error occurred while creating the file.
-    """
-    key_file_name = os.path.join(os.curdir, output_dir, 'keys.json')
-    key_file = open(key_file_name, 'w')
-    key_file.write('{\n')
-    print('Created file: ' + key_file_name)
-    return key_file
-
-
-def _close_key_file(key_file):
-    """Closes a key file created and opened with _create_key_file().
-
-    Args:
-        key_file: A file created by _create_key_file().
-
-    Raises:
-        IOError: An error occurred while writing to or closing the file.
-    """
-    key_file.write('\n}\n')
-    key_file.close()
-
-
-def write_files(author, lang, output_dir, units, write_key_file):
-    """Writes the output files for the given units.
-
-    There are three possible output files:
-    * lang_file: JSON file mapping meanings (e.g., Maze.turnLeft) to the
-      English text.  The base name of the language file is specified by the
-      "lang" command-line argument.
-    * key_file: JSON file mapping meanings to Soy-generated keys (long hash
-      codes).  This is only output if the parameter write_key_file is True.
-    * qqq_file: JSON file mapping meanings to descriptions.
-
-    Args:
-        author: Name and email address of contact for translators.
-        lang: ISO 639-1 source language code.
-        output_dir: Relative directory for output files.
-        units: A list of dictionaries with entries for 'meaning', 'source',
-            'description', and 'keys' (the last only if write_key_file is true),
-            in the order desired in the output files.
-        write_key_file: Whether to output a keys.json file.
-
-    Raises:
-        IOError: An error occurs opening, writing to, or closing a file.
-        KeyError: An expected key is missing from units.
-    """
-    lang_file = _create_lang_file(author, lang, output_dir)
-    qqq_file = _create_qqq_file(output_dir)
-    if write_key_file:
-      key_file = _create_key_file(output_dir)
-    first_entry = True
-    for unit in units:
-        if not first_entry:
-            lang_file.write(',\n')
-            if write_key_file:
-              key_file.write(',\n')
-            qqq_file.write(',\n')
-        lang_file.write(u'\t"{0}": "{1}"'.format(
-            unit['meaning'],
-            unit['source'].replace('"', "'")))
-        if write_key_file:
-          key_file.write('"{0}": "{1}"'.format(unit['meaning'], unit['key']))
-        qqq_file.write(u'\t"{0}": "{1}"'.format(
-            unit['meaning'],
-            unit['description'].replace('"', "'").replace(
-                '{lb}', '{').replace('{rb}', '}')))
-        first_entry = False
-    _close_lang_file(lang_file)
-    if write_key_file:
-      _close_key_file(key_file)
-    _close_qqq_file(qqq_file)