@difizen/libro-jupyter 0.2.35 → 0.2.36

package/src/keybind-instructions/keybind-instructions-items.tsx

@@ -13,7 +13,7 @@ export interface DataType {
 export class LibroKeybindItems {
   commandModeActionColumns: ColumnsType<DataType> = [
     {
-      title: l10n.t('命令态操作'),
+      title: () => l10n.t('命令态操作'),
       dataIndex: 'actionDescription',
       width: '125px',
     },
@@ -49,7 +49,7 @@ export class LibroKeybindItems {
     },
     {
       key: '2',
-      actionDescription: l10n.t('运行选中cell'),
+      actionDescription: l10n.t('运行选中 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -59,7 +59,7 @@ export class LibroKeybindItems {
     },
     {
       key: '3',
-      actionDescription: l10n.t('运行并选择下一个cell'),
+      actionDescription: l10n.t('运行并选择下一个 Cell'),
       keybind: (
         <>
           <Tag>Shift</Tag>
@@ -69,7 +69,7 @@ export class LibroKeybindItems {
     },
     {
       key: '4',
-      actionDescription: l10n.t('运行并新增cell'),
+      actionDescription: l10n.t('运行并新增 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Option' : 'Alt'}</Tag>
@@ -79,7 +79,7 @@ export class LibroKeybindItems {
     },
     {
       key: '5',
-      actionDescription: l10n.t('隐藏Code'),
+      actionDescription: l10n.t('隐藏 Code'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -89,7 +89,7 @@ export class LibroKeybindItems {
     },
     {
       key: '6',
-      actionDescription: l10n.t('隐藏Output'),
+      actionDescription: l10n.t('隐藏 Output'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -99,7 +99,7 @@ export class LibroKeybindItems {
     },
     {
       key: '7',
-      actionDescription: l10n.t('切分cell'),
+      actionDescription: l10n.t('切分 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -287,7 +287,7 @@ export class LibroKeybindItems {
     },
     {
       key: '2',
-      actionDescription: l10n.t('运行选中cell'),
+      actionDescription: l10n.t('运行选中 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -297,7 +297,7 @@ export class LibroKeybindItems {
     },
     {
       key: '3',
-      actionDescription: l10n.t('运行并选择下一个cell'),
+      actionDescription: l10n.t('运行并选择下一个 Cell'),
       keybind: (
         <>
           <Tag>Shift</Tag>
@@ -307,7 +307,7 @@ export class LibroKeybindItems {
     },
     {
       key: '4',
-      actionDescription: l10n.t('运行并新增cell'),
+      actionDescription: l10n.t('运行并新增 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Option' : 'Alt'}</Tag>
@@ -317,7 +317,7 @@ export class LibroKeybindItems {
     },
     {
       key: '5',
-      actionDescription: l10n.t('选中上个cell'),
+      actionDescription: l10n.t('选中上个 Cell'),
       keybind: (
         <>
           <Tag>Up</Tag>/<Tag>K</Tag>
@@ -326,7 +326,7 @@ export class LibroKeybindItems {
     },
     {
       key: '6',
-      actionDescription: l10n.t('隐藏Code'),
+      actionDescription: l10n.t('隐藏 Code'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -336,7 +336,7 @@ export class LibroKeybindItems {
     },
     {
       key: '7',
-      actionDescription: l10n.t('隐藏Output'),
+      actionDescription: l10n.t('隐藏 Output'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -346,7 +346,7 @@ export class LibroKeybindItems {
     },
     {
       key: '8',
-      actionDescription: l10n.t('选中下个cell'),
+      actionDescription: l10n.t('选中下个 Cell'),
       keybind: (
         <>
           <Tag>Down</Tag>/<Tag>J</Tag>
@@ -355,7 +355,7 @@ export class LibroKeybindItems {
     },
     {
       key: '9',
-      actionDescription: l10n.t('向上新增cell'),
+      actionDescription: l10n.t('向上新增 Cell'),
       keybind: (
         <>
           <Tag>A</Tag>
@@ -364,7 +364,7 @@ export class LibroKeybindItems {
     },
     {
       key: '10',
-      actionDescription: l10n.t('向下新增cell'),
+      actionDescription: l10n.t('向下新增 Cell'),
       keybind: (
         <>
           <Tag>B</Tag>
@@ -373,7 +373,7 @@ export class LibroKeybindItems {
     },
     {
       key: '11',
-      actionDescription: l10n.t('删除选中cell'),
+      actionDescription: l10n.t('删除选中 Cell'),
       keybind: (
         <>
           <Tag>D D</Tag>
@@ -382,7 +382,7 @@ export class LibroKeybindItems {
     },
     {
       key: '12',
-      actionDescription: l10n.t('复制cell'),
+      actionDescription: l10n.t('复制 Cell'),
       keybind: (
         <>
           <Tag>C</Tag>
@@ -391,7 +391,7 @@ export class LibroKeybindItems {
     },
     {
       key: '13',
-      actionDescription: l10n.t('剪切cell'),
+      actionDescription: l10n.t('剪切 Cell'),
       keybind: (
         <>
           <Tag>X</Tag>
@@ -400,7 +400,7 @@ export class LibroKeybindItems {
     },
     {
       key: '14',
-      actionDescription: l10n.t('粘贴cell'),
+      actionDescription: l10n.t('粘贴 Cell'),
       keybind: (
         <>
           <Tag>V</Tag>
@@ -409,7 +409,7 @@ export class LibroKeybindItems {
     },
     {
       key: '15',
-      actionDescription: l10n.t('上移cell'),
+      actionDescription: l10n.t('上移 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -420,7 +420,7 @@ export class LibroKeybindItems {
     },
     {
       key: '16',
-      actionDescription: l10n.t('下移cell'),
+      actionDescription: l10n.t('下移 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -431,7 +431,7 @@ export class LibroKeybindItems {
     },
     {
       key: '17',
-      actionDescription: l10n.t('合并选中cell'),
+      actionDescription: l10n.t('合并选中 Cell'),
       keybind: (
         <>
           <Tag>Shift</Tag>
@@ -441,7 +441,7 @@ export class LibroKeybindItems {
     },
     {
       key: '18',
-      actionDescription: l10n.t('向下合并cell'),
+      actionDescription: l10n.t('向下合并 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -452,7 +452,7 @@ export class LibroKeybindItems {
     },
     {
       key: '19',
-      actionDescription: l10n.t('向上合并cell'),
+      actionDescription: l10n.t('向上合并 Cell'),
       keybind: (
         <>
           <Tag>{isMacintosh ? 'Cmd' : 'Ctrl'}</Tag>
@@ -481,7 +481,7 @@ export class LibroKeybindItems {
     },
     {
       key: '22',
-      actionDescription: l10n.t('转为Code Cell'),
+      actionDescription: l10n.t('转为 Code Cell'),
       keybind: (
         <>
           <Tag>Y</Tag>
@@ -490,7 +490,7 @@ export class LibroKeybindItems {
     },
     {
       key: '23',
-      actionDescription: l10n.t('转为Markdown Cell'),
+      actionDescription: l10n.t('转为 Markdown Cell'),
       keybind: (
         <>
           <Tag>M</Tag>
@@ -553,7 +553,7 @@ export class LibroKeybindItems {
     },
     {
       key: '30',
-      actionDescription: l10n.t('向上多选Cell'),
+      actionDescription: l10n.t('向上多选 Cell'),
       keybind: (
         <>
           <Tag>Shift</Tag>
@@ -564,7 +564,7 @@ export class LibroKeybindItems {
     },
     {
       key: '31',
-      actionDescription: l10n.t('向下多选Cell'),
+      actionDescription: l10n.t('向下多选 Cell'),
       keybind: (
         <>
           <Tag>Shift</Tag>
@@ -575,7 +575,7 @@ export class LibroKeybindItems {
     },
     {
       key: '32',
-      actionDescription: l10n.t('选中当前及之前cell'),
+      actionDescription: l10n.t('选中当前及之前 Cell'),
       keybind: (
         <>
           <Tag>Shift</Tag>
@@ -585,7 +585,7 @@ export class LibroKeybindItems {
     },
     {
       key: '33',
-      actionDescription: l10n.t('选中当前及之后cell'),
+      actionDescription: l10n.t('选中当前及之后 Cell'),
       keybind: (
         <>
           <Tag>Shift</Tag>

package/src/keybind-instructions/keybind-instructions-view.tsx

@@ -62,67 +62,6 @@ export class KeybindInstrutionsService implements Disposable {
 
 type Segment = 'keybind' | 'magic';
 
-const magicColumns = [
-  {
-    title: '关键字',
-    dataIndex: 'value',
-    key: 'value',
-  },
-  {
-    title: '含义',
-    dataIndex: 'description',
-    key: 'description',
-  },
-];
-
-const magics = [
-  {
-    key: '1',
-    value: '%timeit',
-    description: '测试单行语句的执行时间',
-  },
-  {
-    key: '2',
-    value: '%%timeit',
-    description: '测试整个块中代码的执行时间',
-  },
-  {
-    key: '3',
-    value: '%run',
-    description: '调用外部python脚本',
-  },
-  {
-    key: '4',
-    value: '%pwd',
-    description: '查看当前工作目录',
-  },
-  {
-    key: '5',
-    value: '%ls',
-    description: '查看目录文件列表',
-  },
-  {
-    key: '6',
-    value: '%reset',
-    description: '清除全部变量',
-  },
-  {
-    key: '7',
-    value: '%who',
-    description: '查看所有全局变量的名称，若给定类型参数，只返回该类型的变量列表',
-  },
-  {
-    key: '8',
-    value: '%whos',
-    description: '显示所有的全局变量名称、类型、值/信息',
-  },
-  {
-    key: '9',
-    value: '%env',
-    description: '列出全部环境变量',
-  },
-];
-
 export const KeybindInstrutionsComponent = forwardRef<
   HTMLDivElement,
   ModalItemProps<void>
@@ -154,6 +93,69 @@ export const KeybindInstrutionsComponent = forwardRef<
     );
   };
 
+  const magicColumns = [
+    {
+      title: l10n.t('关键字'),
+      dataIndex: 'value',
+      key: 'value',
+    },
+    {
+      title: l10n.t('含义'),
+      dataIndex: 'description',
+      key: 'description',
+    },
+  ];
+
+  const magics = [
+    {
+      key: '1',
+      value: '%timeit',
+      description: `${l10n.t('测试单行语句的运行时间')}`,
+    },
+    {
+      key: '2',
+      value: '%%timeit',
+      description: l10n.t('测试整个块中代码的运行时间'),
+    },
+    {
+      key: '3',
+      value: '%run',
+      description: l10n.t('调用外部 python 脚本'),
+    },
+    {
+      key: '4',
+      value: '%pwd',
+      description: l10n.t('查看当前工作目录'),
+    },
+    {
+      key: '5',
+      value: '%ls',
+      description: l10n.t('查看目录文件列表'),
+    },
+    {
+      key: '6',
+      value: '%reset',
+      description: l10n.t('清除全部变量'),
+    },
+    {
+      key: '7',
+      value: '%who',
+      description: l10n.t(
+        '查看所有全局变量的名称，若给定类型参数，只返回该类型的变量列表',
+      ),
+    },
+    {
+      key: '8',
+      value: '%whos',
+      description: l10n.t('显示所有的全局变量名称、类型、值/信息'),
+    },
+    {
+      key: '9',
+      value: '%env',
+      description: l10n.t('列出全部环境变量'),
+    },
+  ];
+
   const commandModeDataSource = getOrigin(
     keybindInstrutionsService.searchCommandModeData.length > 0
       ? keybindInstrutionsService.searchCommandModeData
@@ -177,7 +179,7 @@ export const KeybindInstrutionsComponent = forwardRef<
     >
       <div className="libro-keybind-instructions-command" ref={ref}>
         <Drawer
-          title="快捷键"
+          title={l10n.t('快捷键')}
           placement="right"
           onClose={handleClose}
           width="330px"
@@ -191,9 +193,10 @@ export const KeybindInstrutionsComponent = forwardRef<
             onChange={(value) => setSegment(value as Segment)}
             options={[
               { label: l10n.t('快捷键'), value: 'keybind' },
-              { label: 'Magic 命令', value: 'magic' },
+              { label: l10n.t('Magic 命令'), value: 'magic' },
             ]}
           />
+
           {segment === 'magic' && (
             <div className="libro-magic-table">
               <Table

package/src/libro-jupyter-protocol.ts

@@ -8,7 +8,6 @@ import type {
 import { ExecutableCellModel } from '@difizen/libro-core';
 import type { IContentsModel } from '@difizen/libro-kernel';
 import type { Event as ManaEvent, Emitter } from '@difizen/mana-app';
-import { l10n } from '@difizen/mana-l10n';
 
 export interface ExecutionMeta extends PartialJSONObject {
   'shell.execute_reply.started': string; // Kernel 开始执行任务时间在 metadata 中的 key
@@ -81,19 +80,19 @@ export const jupyterServiceStatus: Record<string, ServerStatus> = {
     category: 'JupyterService',
     color: statusToColor.blocking,
     text: 'loading',
-    text_zh: l10n.t('加载中'),
+    text_zh: '加载中',
   },
   failed: {
     category: 'JupyterService',
     color: statusToColor.error,
     text: 'failed',
-    text_zh: l10n.t('加载失败'),
+    text_zh: '加载失败',
   },
   loaded: {
     category: 'JupyterService',
     color: statusToColor.canRunImmediate,
     text: 'loaded',
-    text_zh: l10n.t('加载完成'),
+    text_zh: '加载完成',
   },
 };
 
@@ -102,54 +101,54 @@ export const kernelStatus: Record<string, ServerStatus> = {
     category: 'Kernel',
     color: statusToColor.blocking,
     text: 'connecting',
-    text_zh: l10n.t('正在连接'),
+    text_zh: '正在连接',
   },
   unknown: {
     category: 'Kernel',
     color: statusToColor.blocking,
     text: 'unknown',
-    text_zh: l10n.t('未知'),
+    text_zh: '未知',
   },
   starting: {
     category: 'Kernel',
     color: statusToColor.blocking,
     text: 'starting',
-    text_zh: l10n.t('启动中'),
+    text_zh: '启动中',
   },
   idle: {
     category: 'Kernel',
     color: statusToColor.canRunImmediate,
     text: 'idle',
-    text_zh: l10n.t('空闲'),
+    text_zh: '空闲',
   },
   busy: {
     category: 'Kernel',
     color: statusToColor.canRun,
     text: 'busy',
-    text_zh: l10n.t('忙碌'),
+    text_zh: '忙碌',
   },
   terminating: {
     category: 'Kernel',
     color: statusToColor.blocking,
     text: 'terminating',
-    text_zh: l10n.t('终止中'),
+    text_zh: '终止中',
   },
   restarting: {
     category: 'Kernel',
     color: statusToColor.blocking,
     text: 'restarting',
-    text_zh: l10n.t('重启中'),
+    text_zh: '重启中',
   },
   autorestarting: {
     category: 'Kernel',
     color: statusToColor.blocking,
     text: 'autorestarting',
-    text_zh: l10n.t('自动重启中'),
+    text_zh: '自动重启中',
   },
   dead: {
     category: 'Kernel',
     color: statusToColor.error,
     text: 'dead',
-    text_zh: l10n.t('死亡'),
+    text_zh: '死亡',
   },
 };

package/src/toolbar/index.less

@@ -148,7 +148,7 @@
 }
 
 .libro-run-menu-container {
-  width: 220px;
+  width: 330px;
   background-color: var(--mana-libro-popover-background-color) !important;
   .@{ant-prefix}-dropdown-menu-item:hover {
     background-color: var(--mana-libro-menu-hover-color) !important;

package/src/toolbar/kernel-status-and-selector.tsx

@@ -6,7 +6,6 @@ import { l10n } from '@difizen/mana-l10n';
 import { Badge } from 'antd';
 
 import type { LibroJupyterModel } from '../libro-jupyter-model.js';
-
 import './index.less';
 import { kernelStatus } from '../libro-jupyter-protocol.js';
 import { getServiceStatusInfo } from '../utils/index.js';
@@ -31,7 +30,7 @@ export const KernelStatusSelector: React.FC = () => {
     return (
       <div className="libro-kernel-and-container-status">
         <div className="libro-kernel-status-and-selector">
-          <span className="kernel">kernel：</span>
+          <span className="kernel">{l10n.t('kernel：')}</span>
           <KernelSelector />
           {showBadge &&
             (isKernelBusy ? (
@@ -39,14 +38,14 @@ export const KernelStatusSelector: React.FC = () => {
                 className="libro-kernel-badge"
                 key="libro-kernel-badge"
                 color={kernelStatus['busy'].color}
-                text={kernelStatus['busy'].text_zh}
+                text={l10n.t(kernelStatus['busy'].text_zh)}
               />
             ) : (
               <Badge
                 className="libro-kernel-badge"
                 key="libro-kernel-badge"
                 color={color}
-                text={text_zh}
+                text={l10n.t(text_zh)}
               />
             ))}
         </div>

package/src/toolbar/run-selector.tsx

@@ -35,8 +35,9 @@ export const RunSelector: React.FC = () => {
     libroModel as LibroJupyterModel,
   );
 
-  const [kernelUnreadyBtnText, setKernelUnreadyBtnText] =
-    useState<string>('kernel准备中，无法执行');
+  const [kernelUnreadyBtnText, setKernelUnreadyBtnText] = useState<string>(
+    l10n.t('kernel准备中，无法执行'),
+  );
 
   useEffect(() => {
     configService

package/src/toolbar/side-toolbar-run-selector.tsx

@@ -11,56 +11,54 @@ import { LibroJupyterConfiguration } from '../index.js';
 import type { LibroJupyterModel } from '../libro-jupyter-model.js';
 import { kernelPrepared } from '../utils/index.js';
 
-const items: LibroSideToolbarMenuItemType[] = [
-  {
-    id: NotebookCommands['RunCell'].id,
-    label: (
-      <>
-        <span className="libro-menu-item-label">{l10n.t('运行 Cell')}</span>
-        <span className="libro-menu-item-keybind">Cmd + Enter</span>
-      </>
-    ),
-
-    group: 'runCell1',
-  },
-  {
-    id: NotebookCommands['RunAllAbove'].id,
-    label: (
-      <>
-        <span className="libro-menu-item-label">{l10n.t('运行上方所有 Cell')}</span>
-        <span className="libro-menu-item-keybind">Cmd + F8</span>
-      </>
-    ),
-
-    group: 'runCell2',
-  },
-  {
-    id: NotebookCommands['RunAllBelow'].id,
-    label: (
-      <>
-        <span className="libro-menu-item-label">
-          {l10n.t('运行当前及下方所有 Cell')}
-        </span>
-        <span className="libro-menu-item-keybind">Cmd + F10</span>
-      </>
-    ),
-
-    group: 'runCell2',
-  },
-];
-
 export const SideToolbarRunSelector: React.FC = () => {
   const libroView = useInject<LibroView>(ViewInstance);
   const libroServerManager = useInject(ServerManager);
   const configService = useInject<ConfigurationService>(ConfigurationService);
   const libroModel = libroView ? libroView.model : undefined;
+  const items: LibroSideToolbarMenuItemType[] = [
+    {
+      id: NotebookCommands['RunCell'].id,
+      label: (
+        <>
+          <span className="libro-menu-item-label">{l10n.t('运行 Cell')}</span>
+          <span className="libro-menu-item-keybind">Cmd + Enter</span>
+        </>
+      ),
+
+      group: 'runCell1',
+    },
+    {
+      id: NotebookCommands['RunAllAbove'].id,
+      label: (
+        <>
+          <span className="libro-menu-item-label">{l10n.t('运行之前所有 Cell')}</span>
+          <span className="libro-menu-item-keybind">Cmd + F8</span>
+        </>
+      ),
+
+      group: 'runCell2',
+    },
+    {
+      id: NotebookCommands['RunAllBelow'].id,
+      label: (
+        <>
+          <span className="libro-menu-item-label">{l10n.t('运行当前及之后 Cell')}</span>
+          <span className="libro-menu-item-keybind">Cmd + F10</span>
+        </>
+      ),
+
+      group: 'runCell2',
+    },
+  ];
   const isKernelPrepared = kernelPrepared(
     libroServerManager,
     libroModel as LibroJupyterModel,
   );
 
-  const [kernelUnreadyBtnText, setKernelUnreadyBtnText] =
-    useState<string>('kernel准备中，无法执行');
+  const [kernelUnreadyBtnText, setKernelUnreadyBtnText] = useState<string>(
+    l10n.t('kernel准备中，无法运行'),
+  );
 
   useEffect(() => {
     configService

package/src/toolbar/toolbar-contribution.tsx

@@ -52,9 +52,9 @@ export class LibroJupyterToolbarContribution implements ToolbarContribution {
       command: NotebookCommands['SelectLastRunCell'].id,
       group: ['group2'],
       order: 'b',
-      tooltip: (
+      tooltip: () => (
         <div className="libro-tooltip">
-          <span className="libro-tooltip-text">{l10n.t('定位正在执行的Cell')}</span>
+          <span className="libro-tooltip-text">{l10n.t('定位正在运行的 Cell')}</span>
         </div>
       ),
     });