@jupyterlab/translation-extension 4.4.0-beta.0 → 4.4.0-beta.2

package/lib/index.d.ts

@@ -6,5 +6,5 @@ import { JupyterFrontEndPlugin } from '@jupyterlab/application';
 /**
  * Export the plugins as default.
  */
-declare const plugins: JupyterFrontEndPlugin<any>[];
+declare const plugins: JupyterFrontEndPlugin<unknown>[];
 export default plugins;

package/lib/index.js

@@ -10,19 +10,39 @@ import { ILabShell, JupyterFrontEnd } from '@jupyterlab/application';
 import { Dialog, ICommandPalette, showDialog } from '@jupyterlab/apputils';
 import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
-import { ITranslator, requestTranslationsAPI, TranslationManager } from '@jupyterlab/translation';
+import { ITranslator, ITranslatorConnector, TranslationManager, TranslatorConnector } from '@jupyterlab/translation';
 /**
  * Translation plugins
  */
 const PLUGIN_ID = '@jupyterlab/translation-extension:plugin';
+/**
+ * Provide the translator connector as a separate plugin to allow for alternative
+ * implementations that may want to fetch translation bundles from a different
+ * source or endpoint.
+ */
+const translatorConnector = {
+    id: '@jupyterlab/translation-extension:translator-connector',
+    description: 'Provides the application translation connector.',
+    autoStart: true,
+    requires: [JupyterFrontEnd.IPaths],
+    provides: ITranslatorConnector,
+    activate: (app, paths) => {
+        const url = paths.urls.translations;
+        const serverSettings = app.serviceManager.serverSettings;
+        return new TranslatorConnector(url, serverSettings);
+    }
+};
+/**
+ * The main translator plugin.
+ */
 const translator = {
-    id: '@jupyterlab/translation:translator',
+    id: '@jupyterlab/translation-extension:translator',
     description: 'Provides the application translation object.',
     autoStart: true,
     requires: [JupyterFrontEnd.IPaths, ISettingRegistry],
-    optional: [ILabShell],
+    optional: [ILabShell, ITranslatorConnector],
     provides: ITranslator,
-    activate: async (app, paths, settings, labShell) => {
+    activate: async (app, paths, settings, labShell, connector) => {
         const setting = await settings.load(PLUGIN_ID);
         const currentLocale = setting.get('locale').composite;
         let stringsPrefix = setting.get('stringsPrefix')
@@ -31,8 +51,13 @@ const translator = {
             .composite;
         stringsPrefix = displayStringsPrefix ? stringsPrefix : '';
         const serverSettings = app.serviceManager.serverSettings;
-        const translationManager = new TranslationManager(paths.urls.translations, stringsPrefix, serverSettings);
+        const translationManager = new TranslationManager(paths.urls.translations, stringsPrefix, serverSettings, connector !== null && connector !== void 0 ? connector : undefined);
+        // As we wait for fetching the translation, ITranslator is guarantee to be
+        // ready when consumed in other plugins.
         await translationManager.fetch(currentLocale);
+        // Set the document language after optionally fetching the system language
+        // if the setting 'locale' is set to 'default'
+        document.documentElement.lang = translationManager.languageCode;
         // Set translator to UI
         if (labShell) {
             labShell.translator = translationManager;
@@ -47,115 +72,88 @@ const translator = {
 const langMenu = {
     id: PLUGIN_ID,
     description: 'Adds translation commands and settings.',
-    requires: [ISettingRegistry, ITranslator],
+    requires: [ISettingRegistry, ITranslator, ITranslatorConnector],
     optional: [IMainMenu, ICommandPalette],
     autoStart: true,
-    activate: (app, settings, translator, mainMenu, palette) => {
+    activate: (app, settings, translator, translatorConnector, mainMenu, palette) => {
+        var _a;
         const trans = translator.load('jupyterlab');
         const { commands } = app;
-        let currentLocale;
-        /**
-         * Load the settings for this extension
-         *
-         * @param setting Extension settings
-         */
-        function loadSetting(setting) {
-            // Read the settings and convert to the correct type
-            currentLocale = setting.get('locale').composite;
-        }
-        settings
-            .load(PLUGIN_ID)
-            .then(setting => {
-            var _a;
-            // Read the settings
-            loadSetting(setting);
-            // Ensure currentLocale is not 'default' which is not a valid language code
-            if (currentLocale !== 'default') {
-                document.documentElement.lang = (currentLocale !== null && currentLocale !== void 0 ? currentLocale : '').replace('_', '-');
-            }
-            else {
-                document.documentElement.lang = 'en-US';
-            }
-            // Listen for your plugin setting changes using Signal
-            setting.changed.connect(loadSetting);
-            // Create a languages menu
-            const languagesMenu = mainMenu
-                ? (_a = mainMenu.settingsMenu.items.find(item => {
-                    var _a;
-                    return item.type === 'submenu' &&
-                        ((_a = item.submenu) === null || _a === void 0 ? void 0 : _a.id) === 'jp-mainmenu-settings-language';
-                })) === null || _a === void 0 ? void 0 : _a.submenu
-                : null;
-            let command;
-            const serverSettings = app.serviceManager.serverSettings;
-            // Get list of available locales
-            requestTranslationsAPI('', '', {}, serverSettings)
-                .then(data => {
-                for (const locale in data['data']) {
-                    const value = data['data'][locale];
-                    const displayName = value.displayName;
-                    const nativeName = value.nativeName;
-                    const toggled = (currentLocale === 'default' ? 'en' : currentLocale) === locale;
-                    const label = toggled
-                        ? `${displayName}`
-                        : `${displayName} - ${nativeName}`;
-                    // Add a command per language
-                    command = `jupyterlab-translation:${locale}`;
-                    commands.addCommand(command, {
-                        label: label,
-                        caption: label,
-                        isEnabled: () => !toggled,
-                        isVisible: () => true,
-                        isToggled: () => toggled,
-                        execute: () => {
-                            return showDialog({
-                                title: trans.__('Change interface language?'),
-                                body: trans.__('After changing the interface language to %1, you will need to reload JupyterLab to see the changes.', label),
-                                buttons: [
-                                    Dialog.cancelButton({ label: trans.__('Cancel') }),
-                                    Dialog.okButton({ label: trans.__('Change and reload') })
-                                ]
-                            }).then(result => {
-                                if (result.button.accept) {
-                                    setting
-                                        .set('locale', locale)
-                                        .then(() => {
-                                        window.location.reload();
-                                    })
-                                        .catch(reason => {
-                                        console.error(reason);
-                                    });
-                                }
-                            });
-                        }
-                    });
-                    // Add the language command to the menu
-                    if (languagesMenu) {
-                        languagesMenu.addItem({
-                            command,
-                            args: {}
-                        });
-                    }
-                    if (palette) {
-                        palette.addItem({
-                            category: trans.__('Display Languages'),
-                            command
+        // Create a languages menu
+        const languagesMenu = mainMenu
+            ? (_a = mainMenu.settingsMenu.items.find(item => {
+                var _a;
+                return item.type === 'submenu' &&
+                    ((_a = item.submenu) === null || _a === void 0 ? void 0 : _a.id) === 'jp-mainmenu-settings-language';
+            })) === null || _a === void 0 ? void 0 : _a.submenu
+            : null;
+        // Get list of available locales
+        translatorConnector
+            .fetch()
+            .then(languageList => {
+            const appLocale = translator.languageCode.replace('-', '_');
+            for (const locale in languageList.data) {
+                const value = languageList.data[locale];
+                const displayName = value.displayName;
+                const nativeName = value.nativeName;
+                const toggled = appLocale === locale;
+                const label = toggled
+                    ? `${displayName}`
+                    : `${displayName} - ${nativeName}`;
+                // Add a command per language
+                const command = `jupyterlab-translation:${locale}`;
+                commands.addCommand(command, {
+                    label: label,
+                    caption: trans.__('Change interface language to %1', label),
+                    isEnabled: () => !toggled,
+                    isToggled: () => toggled,
+                    execute: async () => {
+                        const result = await showDialog({
+                            title: trans.__('Change interface language?'),
+                            body: trans.__('After changing the interface language to %1, you will need to reload JupyterLab to see the changes.', label),
+                            buttons: [
+                                Dialog.cancelButton(),
+                                Dialog.okButton({ label: trans.__('Change and reload') })
+                            ]
                         });
+                        if (result.button.accept) {
+                            try {
+                                await settings.set(PLUGIN_ID, 'locale', locale);
+                                window.location.reload();
+                            }
+                            catch (reason) {
+                                console.error(`Failed to update language locale to ${locale}`, reason);
+                            }
+                        }
                     }
+                });
+                // Add the language command to the menu
+                if (languagesMenu) {
+                    languagesMenu.addItem({
+                        command,
+                        args: {}
+                    });
                 }
-            })
-                .catch(reason => {
-                console.error(`Available locales errored!\n${reason}`);
-            });
+                if (palette) {
+                    palette.addItem({
+                        category: trans.__('Display Languages'),
+                        command
+                    });
+                }
+            }
         })
             .catch(reason => {
-            console.error(`The jupyterlab translation extension appears to be missing.\n${reason}`);
+            console.error(`Available locales errored!\n${reason}`);
         });
     }
 };
 /**
  * Export the plugins as default.
  */
-const plugins = [translator, langMenu];
+const plugins = [
+    translatorConnector,
+    translator,
+    langMenu
+];
 export default plugins;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/translation-extension",
-  "version": "4.4.0-beta.0",
+  "version": "4.4.0-beta.2",
   "description": "JupyterLab - Translation services",
   "keywords": [
     "jupyter",
@@ -37,11 +37,11 @@
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^4.4.0-beta.0",
-    "@jupyterlab/apputils": "^4.5.0-beta.0",
-    "@jupyterlab/mainmenu": "^4.4.0-beta.0",
-    "@jupyterlab/settingregistry": "^4.4.0-beta.0",
-    "@jupyterlab/translation": "^4.4.0-beta.0"
+    "@jupyterlab/application": "^4.4.0-beta.2",
+    "@jupyterlab/apputils": "^4.5.0-beta.2",
+    "@jupyterlab/mainmenu": "^4.4.0-beta.2",
+    "@jupyterlab/settingregistry": "^4.4.0-beta.2",
+    "@jupyterlab/translation": "^4.4.0-beta.2"
   },
   "devDependencies": {
     "rimraf": "~5.0.5",

package/src/index.ts

@@ -17,8 +17,9 @@ import { IMainMenu } from '@jupyterlab/mainmenu';
 import { ISettingRegistry } from '@jupyterlab/settingregistry';
 import {
   ITranslator,
-  requestTranslationsAPI,
-  TranslationManager
+  ITranslatorConnector,
+  TranslationManager,
+  TranslatorConnector
 } from '@jupyterlab/translation';
 
 /**
@@ -26,18 +27,40 @@ import {
  */
 const PLUGIN_ID = '@jupyterlab/translation-extension:plugin';
 
+/**
+ * Provide the translator connector as a separate plugin to allow for alternative
+ * implementations that may want to fetch translation bundles from a different
+ * source or endpoint.
+ */
+const translatorConnector: JupyterFrontEndPlugin<ITranslatorConnector> = {
+  id: '@jupyterlab/translation-extension:translator-connector',
+  description: 'Provides the application translation connector.',
+  autoStart: true,
+  requires: [JupyterFrontEnd.IPaths],
+  provides: ITranslatorConnector,
+  activate: (app: JupyterFrontEnd, paths: JupyterFrontEnd.IPaths) => {
+    const url = paths.urls.translations;
+    const serverSettings = app.serviceManager.serverSettings;
+    return new TranslatorConnector(url, serverSettings);
+  }
+};
+
+/**
+ * The main translator plugin.
+ */
 const translator: JupyterFrontEndPlugin<ITranslator> = {
-  id: '@jupyterlab/translation:translator',
+  id: '@jupyterlab/translation-extension:translator',
   description: 'Provides the application translation object.',
   autoStart: true,
   requires: [JupyterFrontEnd.IPaths, ISettingRegistry],
-  optional: [ILabShell],
+  optional: [ILabShell, ITranslatorConnector],
   provides: ITranslator,
   activate: async (
     app: JupyterFrontEnd,
     paths: JupyterFrontEnd.IPaths,
     settings: ISettingRegistry,
-    labShell: ILabShell | null
+    labShell: ILabShell | null,
+    connector: ITranslatorConnector | null
   ) => {
     const setting = await settings.load(PLUGIN_ID);
     const currentLocale: string = setting.get('locale').composite as string;
@@ -50,10 +73,17 @@ const translator: JupyterFrontEndPlugin<ITranslator> = {
     const translationManager = new TranslationManager(
       paths.urls.translations,
       stringsPrefix,
-      serverSettings
+      serverSettings,
+      connector ?? undefined
     );
+    // As we wait for fetching the translation, ITranslator is guarantee to be
+    // ready when consumed in other plugins.
     await translationManager.fetch(currentLocale);
 
+    // Set the document language after optionally fetching the system language
+    // if the setting 'locale' is set to 'default'
+    document.documentElement.lang = translationManager.languageCode;
+
     // Set translator to UI
     if (labShell) {
       labShell.translator = translationManager;
@@ -71,131 +101,95 @@ const translator: JupyterFrontEndPlugin<ITranslator> = {
 const langMenu: JupyterFrontEndPlugin<void> = {
   id: PLUGIN_ID,
   description: 'Adds translation commands and settings.',
-  requires: [ISettingRegistry, ITranslator],
+  requires: [ISettingRegistry, ITranslator, ITranslatorConnector],
   optional: [IMainMenu, ICommandPalette],
   autoStart: true,
   activate: (
     app: JupyterFrontEnd,
     settings: ISettingRegistry,
     translator: ITranslator,
+    translatorConnector: ITranslatorConnector,
     mainMenu: IMainMenu | null,
     palette: ICommandPalette | null
   ) => {
     const trans = translator.load('jupyterlab');
     const { commands } = app;
-    let currentLocale: string;
-    /**
-     * Load the settings for this extension
-     *
-     * @param setting Extension settings
-     */
-    function loadSetting(setting: ISettingRegistry.ISettings): void {
-      // Read the settings and convert to the correct type
-      currentLocale = setting.get('locale').composite as string;
-    }
-
-    settings
-      .load(PLUGIN_ID)
-      .then(setting => {
-        // Read the settings
-        loadSetting(setting);
-
-        // Ensure currentLocale is not 'default' which is not a valid language code
-        if (currentLocale !== 'default') {
-          document.documentElement.lang = (currentLocale ?? '').replace(
-            '_',
-            '-'
-          );
-        } else {
-          document.documentElement.lang = 'en-US';
-        }
 
-        // Listen for your plugin setting changes using Signal
-        setting.changed.connect(loadSetting);
-
-        // Create a languages menu
-        const languagesMenu = mainMenu
-          ? mainMenu.settingsMenu.items.find(
-              item =>
-                item.type === 'submenu' &&
-                item.submenu?.id === 'jp-mainmenu-settings-language'
-            )?.submenu
-          : null;
-
-        let command: string;
-
-        const serverSettings = app.serviceManager.serverSettings;
-        // Get list of available locales
-        requestTranslationsAPI<any>('', '', {}, serverSettings)
-          .then(data => {
-            for (const locale in data['data']) {
-              const value = data['data'][locale];
-              const displayName = value.displayName;
-              const nativeName = value.nativeName;
-              const toggled =
-                (currentLocale === 'default' ? 'en' : currentLocale) === locale;
-              const label = toggled
-                ? `${displayName}`
-                : `${displayName} - ${nativeName}`;
-
-              // Add a command per language
-              command = `jupyterlab-translation:${locale}`;
-              commands.addCommand(command, {
-                label: label,
-                caption: label,
-                isEnabled: () => !toggled,
-                isVisible: () => true,
-                isToggled: () => toggled,
-                execute: () => {
-                  return showDialog({
-                    title: trans.__('Change interface language?'),
-                    body: trans.__(
-                      'After changing the interface language to %1, you will need to reload JupyterLab to see the changes.',
-                      label
-                    ),
-                    buttons: [
-                      Dialog.cancelButton({ label: trans.__('Cancel') }),
-                      Dialog.okButton({ label: trans.__('Change and reload') })
-                    ]
-                  }).then(result => {
-                    if (result.button.accept) {
-                      setting
-                        .set('locale', locale)
-                        .then(() => {
-                          window.location.reload();
-                        })
-                        .catch(reason => {
-                          console.error(reason);
-                        });
-                    }
-                  });
-                }
+    // Create a languages menu
+    const languagesMenu = mainMenu
+      ? mainMenu.settingsMenu.items.find(
+          item =>
+            item.type === 'submenu' &&
+            item.submenu?.id === 'jp-mainmenu-settings-language'
+        )?.submenu
+      : null;
+
+    // Get list of available locales
+    translatorConnector
+      .fetch()
+      .then(languageList => {
+        const appLocale = translator.languageCode.replace('-', '_');
+        for (const locale in languageList.data) {
+          const value = languageList.data[locale];
+          const displayName = value.displayName;
+          const nativeName = value.nativeName;
+          const toggled = appLocale === locale;
+          const label = toggled
+            ? `${displayName}`
+            : `${displayName} - ${nativeName}`;
+
+          // Add a command per language
+          const command = `jupyterlab-translation:${locale}`;
+          commands.addCommand(command, {
+            label: label,
+            caption: trans.__('Change interface language to %1', label),
+            isEnabled: () => !toggled,
+            isToggled: () => toggled,
+            execute: async () => {
+              const result = await showDialog({
+                title: trans.__('Change interface language?'),
+                body: trans.__(
+                  'After changing the interface language to %1, you will need to reload JupyterLab to see the changes.',
+                  label
+                ),
+                buttons: [
+                  Dialog.cancelButton(),
+                  Dialog.okButton({ label: trans.__('Change and reload') })
+                ]
               });
 
-              // Add the language command to the menu
-              if (languagesMenu) {
-                languagesMenu.addItem({
-                  command,
-                  args: {}
-                });
-              }
-
-              if (palette) {
-                palette.addItem({
-                  category: trans.__('Display Languages'),
-                  command
-                });
+              if (result.button.accept) {
+                try {
+                  await settings.set(PLUGIN_ID, 'locale', locale);
+                  window.location.reload();
+                } catch (reason) {
+                  console.error(
+                    `Failed to update language locale to ${locale}`,
+                    reason
+                  );
+                }
               }
             }
-          })
-          .catch(reason => {
-            console.error(`Available locales errored!\n${reason}`);
           });
+
+          // Add the language command to the menu
+          if (languagesMenu) {
+            languagesMenu.addItem({
+              command,
+              args: {}
+            });
+          }
+
+          if (palette) {
+            palette.addItem({
+              category: trans.__('Display Languages'),
+              command
+            });
+          }
+        }
       })
       .catch(reason => {
-        console.error(
-          `The jupyterlab translation extension appears to be missing.\n${reason}`
-        );
+        console.error(`Available locales errored!\n${reason}`);
       });
   }
 };
@@ -203,5 +197,9 @@ const langMenu: JupyterFrontEndPlugin<void> = {
 /**
  * Export the plugins as default.
  */
-const plugins: JupyterFrontEndPlugin<any>[] = [translator, langMenu];
+const plugins: JupyterFrontEndPlugin<unknown>[] = [
+  translatorConnector,
+  translator,
+  langMenu
+];
 export default plugins;