Move loading of en locale into Component.js files, use __locales__ for Locale messages, and update tests.

components/mjs/a11y/explorer/explorer.js

@@ -1,5 +1,4 @@
 import './lib/explorer.js';
-import './en.js';
 
 import {ExplorerHandler} from '#js/a11y/explorer.js';
 import {hasWindow} from '#js/util/context.js';

components/mjs/a11y/semantic-enrich/semantic-enrich.js

@@ -1,5 +1,4 @@
 import './lib/semantic-enrich.js';
-import './en.js';
 
 import {combineDefaults} from '#js/components/global.js';
 import {EnrichHandler} from '#js/a11y/semantic-enrich.js';

components/mjs/a11y/speech/speech.js

@@ -1,5 +1,4 @@
 import './lib/speech.js';
-import './en.js';
 
 import {combineDefaults} from '#js/components/global.js';
 import {Package} from '#js/components/package.js';

components/mjs/adaptors/linkedom/linkedom.js

@@ -1,5 +1,4 @@
 import './lib/linkedom.js';
-import './en.js';
 
 import {linkedomAdaptor} from '#js/adaptors/linkedomAdaptor.js';
 

components/mjs/core/core.js

@@ -5,8 +5,6 @@ import {HTMLHandler} from '#js/handlers/html/HTMLHandler.js';
 import {browserAdaptor} from '#js/adaptors/browserAdaptor.js';
 import {Package} from '#js/components/package.js';
 
-import './en.js';
-
 if (MathJax.startup) {
   MathJax.startup.registerConstructor('HTMLHandler', HTMLHandler);
   MathJax.startup.registerConstructor('browserAdaptor', browserAdaptor);

components/mjs/input/mml/init.js

@@ -1,5 +1,4 @@
 import './lib/mml.js';
-import './en.js';
 
 import {MathML} from '#js/input/mathml.js';
 export {MathML};

components/mjs/input/tex/extensions/ams/ams.js

@@ -1,2 +1 @@
 import './lib/ams.js';
-import './en.js';

components/mjs/input/tex/extensions/bbox/bbox.js

@@ -1,2 +1 @@
 import './lib/bbox.js';
-import './en.js';

components/mjs/input/tex/extensions/begingroup/begingroup.js

@@ -1,2 +1 @@
 import './lib/begingroup.js';
-import './en.js';

components/mjs/input/tex/extensions/bussproofs/bussproofs.js

@@ -1,2 +1 @@
 import './lib/bussproofs.js';
-import './en.js';

components/mjs/input/tex/extensions/cases/cases.js

@@ -1,2 +1 @@
 import './lib/cases.js';
-import './en.js';

components/mjs/input/tex/extensions/color/color.js

@@ -1,2 +1 @@
 import './lib/color.js';
-import './en.js';

components/mjs/input/tex/extensions/colortbl/colortbl.js

@@ -1,2 +1 @@
 import './lib/colortbl.js';
-import './en.js';

components/mjs/input/tex/extensions/empheq/empheq.js

@@ -1,2 +1 @@
 import './lib/empheq.js';
-import './en.js';

components/mjs/input/tex/extensions/extpfeil/extpfeil.js

@@ -1,2 +1 @@
 import './lib/extpfeil.js';
-import './en.js';

components/mjs/input/tex/extensions/html/html.js

@@ -1,2 +1 @@
 import './lib/html.js';
-import './en.js';

components/mjs/input/tex/extensions/mathtools/mathtools.js

@@ -1,2 +1 @@
 import './lib/mathtools.js';
-import './en.js';

components/mjs/input/tex/extensions/mhchem/mhchem.js

@@ -1,5 +1,4 @@
 import './lib/mhchem.js';
-import './en.js';
 import {fontExtension} from '../../extension.js';
 
 fontExtension('[tex]/mhchem', 'mathjax-mhchem-font-extension');

components/mjs/input/tex/extensions/newcommand/newcommand.js

@@ -1,2 +1 @@
 import './lib/newcommand.js';
-import './en.js';

components/mjs/input/tex/extensions/physics/physics.js

@@ -1,2 +1 @@
 import './lib/physics.js';
-import './en.js';

components/mjs/input/tex/extensions/require/require.js

@@ -1,2 +1 @@
 import './lib/require.js';
-import './en.js';

components/mjs/input/tex/extensions/setoptions/setoptions.js

@@ -1,2 +1 @@
 import './lib/setoptions.js';
-import './en.js';

components/mjs/input/tex/extensions/textmacros/textmacros.js

@@ -1,2 +1 @@
 import './lib/textmacros.js';
-import './en.js';

components/mjs/input/tex/extensions/unicode/unicode.js

@@ -1,2 +1 @@
 import './lib/unicode.js';
-import './en.js';

components/mjs/input/tex/extensions/verb/verb.js

@@ -1,2 +1 @@
 import './lib/verb.js';
-import './en.js';

components/mjs/input/tex/tex.js

@@ -1,5 +1,4 @@
 import './lib/tex.js';
-import './en.js';
 
 import {registerTeX} from './register.js';
 import {Loader} from '#js/components/loader.js';

components/mjs/locale/config.json

@@ -0,0 +1,7 @@
+{
+  "copy": {
+    "to": "[bundle]/locale",
+    "from": "[ts]/util/Locale",
+    "copy": ["__locales__"]
+  }
+}

components/mjs/ui/menu/menu.js

@@ -1,5 +1,4 @@
 import './lib/menu.js';
-import './en.js';
 
 import {combineDefaults} from '#js/components/global.js';
 import {MenuHandler} from '#js/ui/menu/MenuHandler.js';

package.json

@@ -84,12 +84,13 @@
     "copy:assets": "pnpm -s log:comp 'Copying assets'; copy() { for name in locales mj2 mml3 html; do pnpm -s copy:$name ${1:-mjs}; done; }; copy",
     "copy:bundle": "copy() { components/bin/makeAll --copy --terse components/mjs/${1:-}; }; copy",
     "copy:html": "copy() { pnpm -s log:single 'Copying sre auxiliary files'; pnpm copyfiles -u 1 'ts/a11y/sre/*.html' 'ts/a11y/sre/require.*' $1; }; copy",
-    "copy:locales": "copy() { for name in core tex mml menu a11y adaptors; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ",
+    "copy:locales": "copy() { for name in core tex mml menu util a11y adaptors; do pnpm -s copy:locales:$name ${1:-mjs}; done; }; copy ",
     "copy:locales:a11y": "pnpm -s log:single 'Copying a11y locales'; copy() { pnpm copyfiles -u 1 'ts/a11y/*/__locales__/*.json' $1; }; copy",
     "copy:locales:adaptors": "pnpm -s log:single 'Copying DOMAdaptor locales'; copy() { pnpm copyfiles -u 1 'ts/adaptors/*/__locales__/*.json' $1; }; copy",
     "copy:locales:core": "pnpm -s log:single 'Copying core locales'; copy() { pnpm copyfiles -u 1 'ts/core/__locales__/*.json' $1; }; copy",
     "copy:locales:menu": "pnpm -s log:single 'Copying menu locales'; copy() { pnpm copyfiles -u 1 'ts/ui/menu/__locales__/*.json' $1; }; copy",
     "copy:locales:mml": "pnpm -s log:single 'Copying MathML locales'; copy() { pnpm copyfiles -u 1 'ts/input/mathml/__locales__/*.json' $1; }; copy",
+    "copy:locales:util": "pnpm -s log:single 'Copying utility locales'; copy() { pnpm copyfiles -u 1 'ts/util/*/__locales__/*.json' $1; }; copy",
     "copy:locales:tex": "pnpm -s log:single 'Copying TeX locales'; copy() { pnpm copyfiles -u 1 'ts/input/tex/__locales__/*.json' $1 && pnpm copyfiles -u 3 'ts/input/tex/*/__locales__/*.json' $1/input/tex/extensions; }; copy",
     "copy:mj2": "copy() { pnpm -s log:single 'Copying legacy code AsciiMath'; pnpm copyfiles -u 1 'ts/input/asciimath/legacy/**/*' $1; }; copy",
     "copy:mml3": "copy() { pnpm -s log:single 'Copying MathML3 extension json'; pnpm copyfiles -u 1 ts/input/mathml/mml3/mml3.sef.json $1; }; copy",

testsuite/tests/util/Locale.test.ts

@@ -46,6 +46,7 @@ describe('Locale', () => {
     expect(Locale.message('component', 'Id1', 'message', 'Locale')).toBe(
       'Test of message in Locale'
     );
+    delete locale.locations.component;
   });
 
   /********************************************************************************/
@@ -85,6 +86,16 @@ describe('Locale', () => {
     expect(Locale.message('undefined', 'Id1')).toBe('');
     Locale.current = 'en';
     Locale.default = 'en';
+    delete (Locale as any).locations.component;
+  });
+
+
+  /********************************************************************************/
+
+  test('Register messages for unknown component', async () => {
+    expect(trapOutput('warn', () =>
+      Locale.registerMessages('unknown', 'en', {})
+    )).toBe(`MathJax(Locale): Component 'unknown' doesn't exist`);
   });
 
   /********************************************************************************/
@@ -95,6 +106,7 @@ describe('Locale', () => {
     await Locale.setLocale('test');
     expect(Locale.message('component', 'test1')).toBe('Has % percent');
     Locale.isComponent = false;
+    delete (Locale as any).locations.component;
   });
 
   /********************************************************************************/
@@ -120,6 +132,8 @@ describe('Locale', () => {
     });
     expect(message).toContain("MathJax(fallback): Can't load 'xy.json'");
     expect(locale.data.fallback?.en).toEqual({ Id1: 'Test of %1 in %2' });
+    delete locale.locations.fallback;
+    delete locale.data.fallback;
   });
 
   /********************************************************************************/
@@ -130,6 +144,7 @@ describe('Locale', () => {
       Locale.warn('component', 'test2', 'warn')
     );
     expect(message).toEqual('Has warn one');
+    delete (Locale as any).locations.component;
   });
 
   /********************************************************************************/
@@ -172,6 +187,8 @@ describe('Locale', () => {
     //
     Locale.syncLoad = sync;
     console.error = error;
+    delete locale.locations.sync;
+    delete locale.data.sync;
   });
 
   /********************************************************************************/
@@ -216,6 +233,8 @@ describe('Locale', () => {
     //
     Locale.asyncLoad = async;
     Locale.syncLoad = sync;
+    delete (Locale as any).locations.sync;
+    delete (Locale as any).data.sync;
     mathjax.asyncLoad = load;
     mathjax.asyncIsSynchronous = isSync;
   });

ts/a11y/explorer/__locales__/Component.ts

@@ -22,10 +22,12 @@
  */
 
 import { Locale, namedData } from '../../../util/Locale.js';
+import data from './en.json' with {type: 'json'};
 
 export const COMPONENT = 'a11y/explorer';
 
 Locale.registerLocaleFiles(COMPONENT, '../ts/a11y/explorer');
+Locale.registerMessages(COMPONENT, 'en', data);
 
 /**
  * Get a localized message for this component

ts/a11y/semantic-enrich/__locales__/Component.ts

@@ -22,7 +22,9 @@
  */
 
 import { Locale } from '../../../util/Locale.js';
+import data from './en.json' with {type: 'json'};
 
 export const COMPONENT = 'a11y/semantic-enrich';
 
 Locale.registerLocaleFiles(COMPONENT, '../ts/a11y/semantic-enrich');
+Locale.registerMessages(COMPONENT, 'en', data);