address review comments

Co-Authored-By: Nicolas Brichet <brichet@users.noreply.github.com>

Author: jtpio

packages/jupyter-chat/src/context.ts

@@ -8,7 +8,7 @@ import { createContext, useContext } from 'react';
 
 import { Chat } from './components';
 
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
+export const TRANSLATION_DOMAIN = 'jupyter-chat';
 
 export const ChatReactContext = createContext<Chat.IChatProps | undefined>(
   undefined

packages/jupyter-chat/src/model.ts

@@ -4,13 +4,19 @@
  */
 
 import { IDocumentManager } from '@jupyterlab/docmanager';
+import {
+  ITranslator,
+  nullTranslator,
+  TranslationBundle
+} from '@jupyterlab/translation';
 import { ArrayExt } from '@lumino/algorithm';
 import { CommandRegistry } from '@lumino/commands';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { IDisposable } from '@lumino/disposable';
 import { ISignal, Signal } from '@lumino/signaling';
 
 import { IActiveCellManager } from './active-cell-manager';
+import { TRANSLATION_DOMAIN } from './context';
 import { IInputModel, InputModel } from './input-model';
 import { Message } from './message';
 import { ISelectionWatcher } from './selection-watcher';
@@ -237,6 +243,10 @@ export abstract class AbstractChatModel implements IChatModel {
       ...config
     };
 
+    this._trans = (options.translator ?? nullTranslator).load(
+      TRANSLATION_DOMAIN
+    );
+
     this._inputModel = new InputModel({
       activeCellManager: options.activeCellManager,
       selectionWatcher: options.selectionWatcher,
@@ -695,14 +705,24 @@ export abstract class AbstractChatModel implements IChatModel {
         this._commands
           .execute('apputils:update-notification', {
             id: this._notificationId,
-            message: `${unreadCount} incoming message(s) ${this._name ? 'in ' + this._name : ''}`
+            message: this._name
+              ? this._trans.__(
+                  '%1 incoming message(s) in %2',
+                  unreadCount,
+                  this._name
+                )
+              : this._trans.__('%1 incoming message(s)', unreadCount)
           })
           .then(success => {
             // Create a new notification only if messages are added.
             if (!success && canCreate) {
               this._commands!.execute('apputils:notify', {
                 type: 'info',
-                message: `${unreadCount} incoming message(s) in ${this._name}`
+                message: this._trans.__(
+                  '%1 incoming message(s) in %2',
+                  unreadCount,
+                  this._name
+                )
               }).then(id => {
                 this._notificationId = id;
               });
@@ -725,6 +745,7 @@ export abstract class AbstractChatModel implements IChatModel {
   private _id: string | undefined;
   private _name: string = '';
   private _config: IConfig;
+  protected _trans: TranslationBundle;
   private _readyDelegate = new PromiseDelegate<void>();
   private _inputModel: IInputModel;
   private _disposed = new Signal<this, void>(this);
@@ -770,6 +791,11 @@ export namespace IChatModel {
      */
     commands?: CommandRegistry;
 
+    /**
+     * The translator for internationalization.
+     */
+    translator?: ITranslator;
+
     /**
      * Active cell manager.
      */

packages/jupyter-chat/src/widgets/chat-error.tsx

@@ -9,10 +9,9 @@ import { Alert, Box } from '@mui/material';
 import React from 'react';
 
 import { JlThemeProvider } from '../components/jl-theme-provider';
+import { TRANSLATION_DOMAIN } from '../context';
 import { chatIcon } from '../icons';
 
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
-
 export function buildErrorWidget(
   themeManager: IThemeManager | null,
   translator?: ITranslator

packages/jupyter-chat/src/widgets/chat-selector-popup.tsx

@@ -4,20 +4,24 @@
  */
 
 import { Button } from '@jupyter/react-components';
-import { nullTranslator, TranslationBundle } from '@jupyterlab/translation';
+import {
+  ITranslator,
+  nullTranslator,
+  TranslationBundle
+} from '@jupyterlab/translation';
 import { closeIcon, ReactWidget } from '@jupyterlab/ui-components';
 import { Message } from '@lumino/messaging';
 import React, { useEffect, useRef } from 'react';
 
+import { TRANSLATION_DOMAIN } from '../context';
+
 const POPUP_CLASS = 'jp-chat-selector-popup';
 const POPUP_LIST_CLASS = 'jp-chat-selector-popup-list';
 const POPUP_ITEM_CLASS = 'jp-chat-selector-popup-item';
 const POPUP_ITEM_ACTIVE_CLASS = 'jp-chat-selector-popup-item-active';
 const POPUP_ITEM_LABEL_CLASS = 'jp-chat-selector-popup-item-label';
 const POPUP_EMPTY_CLASS = 'jp-chat-selector-popup-empty';
 
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
-
 /**
  * A popup widget for selecting a chat from a filtered list.
  */
@@ -357,9 +361,6 @@ export namespace ChatSelectorPopup {
   }
 }
 
-// Re-export the ITranslator type for use in the namespace
-import { ITranslator } from '@jupyterlab/translation';
-
 /**
  * Props for the ChatSelectorList component.
  */

packages/jupyter-chat/src/widgets/chat-sidebar.tsx

@@ -6,11 +6,10 @@
 import { nullTranslator } from '@jupyterlab/translation';
 
 import { Chat } from '../components/chat';
+import { TRANSLATION_DOMAIN } from '../context';
 import { chatIcon } from '../icons';
 import { ChatWidget } from './chat-widget';
 
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
-
 export function buildChatSidebar(options: Chat.IOptions): ChatWidget {
   const widget = new ChatWidget(options);
   const trans = (options.translator ?? nullTranslator).load(TRANSLATION_DOMAIN);

packages/jupyter-chat/src/widgets/chat-widget.tsx

@@ -15,6 +15,7 @@ import { Drag } from '@lumino/dragdrop';
 import { Widget } from '@lumino/widgets';
 
 import { Chat, IInputToolbarRegistry, MESSAGE_CLASS } from '../components';
+import { TRANSLATION_DOMAIN } from '../context';
 import { chatIcon } from '../icons';
 import { IChatModel } from '../model';
 import {
@@ -26,8 +27,6 @@ import {
 import { ActiveCellManager } from '../active-cell-manager';
 import { IInputModel } from '../input-model';
 
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
-
 // MIME type constant for file browser drag events
 const FILE_BROWSER_MIME = 'application/x-jupyter-icontentsrich';
 

packages/jupyter-chat/src/widgets/multichat-panel.tsx

@@ -33,6 +33,7 @@ import {
   IInputToolbarRegistry,
   IInputToolbarRegistryFactory
 } from '../components';
+import { TRANSLATION_DOMAIN } from '../context';
 import { chatIcon, readIcon } from '../icons';
 import { IChatModel } from '../model';
 
@@ -42,8 +43,6 @@ const OPEN_SELECT_CLASS = 'jp-chat-open';
 const SIDEPANEL_WIDGET_CLASS = 'jp-chat-sidepanel-widget';
 const TOOLBAR_CLASS = 'jp-chat-sidepanel-widget-toolbar';
 
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
-
 /**
  * Generic sidepanel widget including multiple chats and the add chat button.
  */

packages/jupyterlab-chat-extension/src/chat-commands/providers/emoji.ts

@@ -13,11 +13,10 @@ import {
   IChatCommandProvider,
   IChatCommandRegistry,
   ChatCommand,
-  IInputModel
+  IInputModel,
+  TRANSLATION_DOMAIN
 } from '@jupyter/chat';
 
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
-
 export class EmojiCommandProvider implements IChatCommandProvider {
   constructor(translator?: ITranslator) {
     const trans = (translator ?? nullTranslator).load(TRANSLATION_DOMAIN);

packages/jupyterlab-chat-extension/src/index.ts

@@ -20,6 +20,7 @@ import {
   MessageFooterRegistry,
   MessagePreambleRegistry,
   SelectionWatcher,
+  TRANSLATION_DOMAIN,
   chatIcon,
   readIcon,
   IInputToolbarRegistryFactory,
@@ -75,7 +76,6 @@ import { mentionCommandsPlugin } from './chat-commands/providers/user-mention';
 
 const FACTORY = 'Chat';
 const CHAT_LIST_UPDATE_INTERVAL = 2000;
-const TRANSLATION_DOMAIN = 'jupyterlab_chat';
 
 const pluginIds = {
   activeCellManager: 'jupyterlab-chat-extension:activeCellManager',
@@ -360,6 +360,7 @@ const docFactories: JupyterFrontEndPlugin<ChatWidgetFactory> = {
           user,
           widgetConfig,
           commands: app.commands,
+          translator,
           activeCellManager,
           selectionWatcher,
           documentManager: filebrowser?.model.manager

packages/jupyterlab-chat/src/model.ts

@@ -417,8 +417,8 @@ export class LabChatModel
             const msg: IMessageContent = {
               ...baseMessage,
               sender: this.sharedModel.getUser(sender) || {
-                username: 'User undefined',
-                mention_name: 'User-undefined'
+                username: this._trans.__('User undefined'),
+                mention_name: this._trans.__('User-undefined')
               }
             };
 
@@ -439,8 +439,8 @@ export class LabChatModel
             const mentions: IUser[] = (mentionsIds ?? []).map(
               user =>
                 this.sharedModel.getUser(user) || {
-                  username: 'User undefined',
-                  mention_name: 'User-undefined'
+                  username: this._trans.__('User undefined'),
+                  mention_name: this._trans.__('User-undefined')
                 }
             );
 
@@ -483,8 +483,8 @@ export class LabChatModel
             const mentions: IUser[] = (value as string[]).map(
               user =>
                 this.sharedModel.getUser(user) || {
-                  username: 'User undefined',
-                  mention_name: 'User-undefined'
+                  username: this._trans.__('User undefined'),
+                  mention_name: this._trans.__('User-undefined')
                 }
             );
             if (mentions?.length) {