@difizen/libro-lab 0.2.35 → 0.2.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@difizen/libro-lab",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "description": "",
   "keywords": [
     "libro",
@@ -34,17 +34,19 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^5.1.0",
-    "@difizen/libro-core": "^0.2.35",
-    "@difizen/libro-jupyter": "^0.2.35",
+    "@difizen/libro-core": "^0.2.36",
+    "@difizen/libro-jupyter": "^0.2.36",
     "@difizen/libro-kernel": "^0.2.35",
-    "@difizen/libro-prompt-cell": "^0.2.35",
-    "@difizen/libro-sql-cell": "^0.2.35",
-    "@difizen/libro-terminal": "^0.2.35",
+    "@difizen/libro-prompt-cell": "^0.2.36",
+    "@difizen/libro-sql-cell": "^0.2.36",
+    "@difizen/libro-terminal": "^0.2.36",
     "@difizen/libro-toc": "^0.2.35",
     "@difizen/libro-cofine-editor-core": "^0.2.35",
     "@difizen/libro-language-client": "^0.2.35",
     "@difizen/libro-widget": "^0.2.35",
+    "@difizen/libro-l10n": "^0.2.36",
     "@difizen/mana-app": "latest",
+    "@difizen/mana-l10n": "latest",
     "@difizen/mana-common": "latest",
     "@difizen/mana-react": "latest",
     "classnames": "^2.3.2",

package/src/command/lab-command.ts

@@ -3,10 +3,6 @@ export const LabCommands = {
     id: 'libro-lab-header-menu-help-about',
     label: '关于',
   },
-  // OpenTerminal: {
-  //   id: 'libro-lab-header-menu-terminal-open',
-  //   label: '新建终端',
-  // },
   Save: {
     id: 'libro-lab-save',
     label: '保存',
@@ -18,126 +14,126 @@ export const LabCommands = {
   },
   RedoCellAction: {
     id: 'libro-lab-header-menu-edit-redo-cell-action',
-    label: `恢复单元格操作`,
+    label: '恢复 Cell 操作',
   },
   UndoCellAction: {
     id: 'libro-lab-header-menu-edit-undo-cell-action',
-    label: `撤销单元格操作`,
+    label: '撤销 Cell 操作',
   },
   CutCell: {
     id: 'libro-lab-header-menu-edit-cut-cell',
-    label: `剪切单元格`,
+    label: '剪切 Cell',
   },
   CopyCell: {
     id: 'libro-lab-header-menu-edit-copy-cell',
-    label: `复制单元格`,
+    label: '复制 Cell',
   },
   PasteCellAbove: {
     id: 'libro-lab-header-menu-edit-paste-cell-above',
-    label: `在上方粘贴单元格`,
+    label: '在上方粘贴 Cell',
   },
   PasteCellBelow: {
     id: 'libro-lab-header-menu-edit-paste-cell-below',
-    label: `在下方粘贴单元格`,
+    label: '在下方粘贴 Cell',
   },
   PasteAndReplaceCell: {
     id: 'libro-lab-header-menu-edit-paste-and-replace-cell',
-    label: `粘贴单元格并替换`,
+    label: '粘贴 Cell 并替换',
   },
   DeleteCell: {
     id: 'libro-lab-header-menu-edit-delete-cell',
-    label: `删除单元格`,
+    label: '删除 Cell',
   },
   SelectAll: {
     id: 'libro-lab-header-menu-edit-select-all',
-    label: `选择所有单元格`,
+    label: '选择所有 Cell',
   },
   DeselectAll: {
     id: 'libro-lab-header-menu-edit-deselect-all',
-    label: `取消选择所有单元格`,
+    label: '取消选择所有 Cell',
   },
   MoveCellUp: {
     id: 'libro-lab-header-menu-edit-move-cell-up',
-    label: `上移单元格`,
+    label: '上移 Cell',
   },
   MoveCellDown: {
     id: 'libro-lab-header-menu-edit-move-cell-down',
-    label: `下移单元格`,
+    label: '下移 Cell',
   },
   SplitCellAntCursor: {
     id: 'libro-lab-header-menu-edit-split-cell-at-cursor',
-    label: `切分单元格`,
+    label: '切分 Cell',
   },
   MergeCellAbove: {
     id: 'libro-lab-header-menu-edit-merge-cell-above',
-    label: `合并上方单元格`,
+    label: '合并上方 Cell',
   },
   MergeCellBelow: {
     id: 'libro-lab-header-menu-edit-merge-cell-below',
-    label: `合并下方单元格`,
+    label: '合并下方 Cell',
   },
   MergeCells: {
     id: 'libro-lab-header-menu-edit-merge-cells',
-    label: `合并选中单元格`,
+    label: '合并选中 Cell',
   },
   ClearCellOutput: {
     id: 'libro-lab-header-menu-edit-clear-cell-outputs',
-    label: `清空输出`,
+    label: '清空输出',
   },
   ClearAllCellOutput: {
     id: 'libro-lab-header-menu-edit-clear-all-cell-outputs',
-    label: `清空所有输出`,
+    label: '清空所有输出',
   },
   HideOrShowCellCode: {
     id: 'libro-lab-header-menu-view-hide-or-show-cell-code',
-    label: `隐藏/显示所选单元格代码`,
+    label: '隐藏/显示所选 Cell 代码',
   },
   HideOrShowOutputs: {
     id: 'libro-lab-header-menu-view-hide-or-show-outputs',
-    label: `隐藏/显示所选单元格输出`,
+    label: '隐藏/显示所选 Cell 输出',
   },
   EnableOutputScrolling: {
     id: 'libro-lab-header-menu-view-enable-output-scrolling',
-    label: `固定输出高度`,
+    label: '固定输出高度',
   },
   DisableOutputScrolling: {
     id: 'libro-lab-header-menu-view-disable-output-scrolling',
-    label: `取消固定输出高度`,
+    label: '取消固定输出高度',
   },
   RestartAndRunToSelected: {
     id: 'libro-lab-header-menu-run-restart-and-run-to-selected',
-    label: '重启并执行至选中单元格',
+    label: '重启并运行至选中 Cell',
   },
   RestartRunAll: {
     id: 'libro-lab-header-menu-run-restart-run-all',
-    label: '重启并执行全部单元格',
+    label: '重启并运行全部 Cell',
   },
   RunAllAbove: {
     id: 'libro-lab-header-menu-run-all-above',
-    label: `执行上方所有单元格`,
+    label: '运行之前所有 Cell',
   },
   RunAllBelow: {
     id: 'libro-lab-header-menu-run-all-below',
-    label: `执行下方所有单元格`,
+    label: '运行当前及之后 Cell',
   },
   RunAllCells: {
     id: 'libro-lab-header-menu-run-all-cells',
-    label: `执行全部单元格`,
+    label: '运行全部 Cell',
   },
   RunCell: {
     id: 'libro-lab-header-menu-run-cell',
-    label: `执行选中单元格`,
+    label: '运行选中 Cell',
   },
   RunCellAndInsertBelow: {
     id: 'libro-lab-header-menu-run-cell-and-insert-below',
-    label: `执行选中并向下插入一个单元格`,
+    label: '运行选中并向下插入一个 Cell',
   },
   RunCellAndSelectNext: {
     id: 'libro-lab-header-menu-run-cell-and-select-next',
-    label: `执行并选中下一个单元格`,
+    label: '运行并选中下一个 Cell',
   },
   ToggleBottom: {
     id: 'libro-lab-toggle-bottom',
-    label: `切换底部面板`,
+    label: '切换底部面板',
   },
 };

package/src/command/{lab-menu-contribution.ts → lab-menu-contribution.tsx}

@@ -18,6 +18,7 @@ import {
   singleton,
   ViewManager,
 } from '@difizen/mana-app';
+import { l10n } from '@difizen/mana-l10n';
 
 import { LibroLabLayoutSlots } from '../layout/index.js';
 import { LayoutService } from '../layout/layout-service.js';
@@ -51,76 +52,83 @@ export class LabMenu
   }
 
   registerMenus(menu: MenuRegistry) {
-    menu.registerSubmenu(LabMenus.FILE, { label: '文件' });
-    menu.registerSubmenu(LabMenus.EDIT, { label: '编辑' });
-    menu.registerSubmenu(LabMenus.VIEW, { label: '视图' });
-    menu.registerSubmenu(LabMenus.RUN, { label: '运行' });
-    menu.registerSubmenu(LabMenus.TERMINAL, { label: '终端' });
-    menu.registerSubmenu(LabMenus.HELP, { label: '帮助' });
+    menu.registerSubmenu(LabMenus.FILE, { label: () => <div>{l10n.t('文件')}</div> });
+    menu.registerSubmenu(LabMenus.EDIT, { label: () => <div>{l10n.t('编辑')}</div> });
+    menu.registerSubmenu(LabMenus.VIEW, { label: () => <div>{l10n.t('视图')}</div> });
+    menu.registerSubmenu(LabMenus.RUN, { label: () => <div>{l10n.t('运行')}</div> });
+    menu.registerSubmenu(LabMenus.TERMINAL, {
+      label: () => <div>{l10n.t('终端')}</div>,
+    });
+    menu.registerSubmenu(LabMenus.HELP, { label: () => <div>{l10n.t('帮助')}</div> });
     menu.registerMenuAction(LabMenus.TERMINAL, {
       id: TerminalCommands['OpenTerminal'].id,
       command: TerminalCommands['OpenTerminal'].id,
-      label: TerminalCommands['OpenTerminal'].label,
+      label: () => (
+        <div>
+          {TerminalCommands['OpenTerminal'].label &&
+            l10n.t(TerminalCommands['OpenTerminal'].label)}
+        </div>
+      ),
     });
     menu.registerMenuAction(LabMenus.HELP, {
       id: LabCommands.About.id,
       command: LabCommands.About.id,
-      label: LabCommands.About.label,
+      label: () => <div>{l10n.t(LabCommands.About.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.FILE, {
       id: LabCommands.Save.id,
       command: LabCommands.Save.id,
-      label: LabCommands.Save.label,
+      label: () => <div>{l10n.t(LabCommands.Save.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.FILE, {
       id: LabCommands.CreateFile.id,
       command: LabCommands.CreateFile.id,
-      label: LabCommands.CreateFile.label,
+      label: () => <div>{l10n.t(LabCommands.CreateFile.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.UndoCellAction.id,
       command: LabCommands.UndoCellAction.id,
-      label: LabCommands.UndoCellAction.label,
+      label: () => <div>{l10n.t(LabCommands.UndoCellAction.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.RedoCellAction.id,
       command: LabCommands.RedoCellAction.id,
-      label: LabCommands.RedoCellAction.label,
+      label: () => <div>{l10n.t(LabCommands.RedoCellAction.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.CutCell.id,
       command: LabCommands.CutCell.id,
-      label: LabCommands.CutCell.label,
+      label: () => <div>{l10n.t(LabCommands.CutCell.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.CopyCell.id,
       command: LabCommands.CopyCell.id,
-      label: LabCommands.CopyCell.label,
+      label: () => <div>{l10n.t(LabCommands.CopyCell.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.PasteCellBelow.id,
       command: LabCommands.PasteCellBelow.id,
-      label: LabCommands.PasteCellBelow.label,
+      label: () => <div>{l10n.t(LabCommands.PasteCellBelow.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.PasteCellAbove.id,
       command: LabCommands.PasteCellAbove.id,
-      label: LabCommands.PasteCellAbove.label,
+      label: () => <div>{l10n.t(LabCommands.PasteCellAbove.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.PasteAndReplaceCell.id,
       command: LabCommands.PasteAndReplaceCell.id,
-      label: LabCommands.PasteAndReplaceCell.label,
+      label: () => <div>{l10n.t(LabCommands.PasteAndReplaceCell.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.DeleteCell.id,
       command: LabCommands.DeleteCell.id,
-      label: LabCommands.DeleteCell.label,
+      label: () => <div>{l10n.t(LabCommands.DeleteCell.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.SelectAll.id,
       command: LabCommands.SelectAll.id,
-      label: LabCommands.SelectAll.label,
+      label: () => <div>{l10n.t(LabCommands.SelectAll.label)}</div>,
     });
     // menu.registerMenuAction(HeaderMenus.EDIT, {
     //   id: LabCommands.DeselectAll.id,
@@ -130,102 +138,102 @@ export class LabMenu
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.MoveCellUp.id,
       command: LabCommands.MoveCellUp.id,
-      label: LabCommands.MoveCellUp.label,
+      label: () => <div>{l10n.t(LabCommands.MoveCellUp.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.MoveCellDown.id,
       command: LabCommands.MoveCellDown.id,
-      label: LabCommands.MoveCellDown.label,
+      label: () => <div>{l10n.t(LabCommands.MoveCellDown.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.SplitCellAntCursor.id,
       command: LabCommands.SplitCellAntCursor.id,
-      label: LabCommands.SplitCellAntCursor.label,
+      label: () => <div>{l10n.t(LabCommands.SplitCellAntCursor.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.MergeCells.id,
       command: LabCommands.MergeCells.id,
-      label: LabCommands.MergeCells.label,
+      label: () => <div>{l10n.t(LabCommands.MergeCells.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.MergeCellAbove.id,
       command: LabCommands.MergeCellAbove.id,
-      label: LabCommands.MergeCellAbove.label,
+      label: () => <div>{l10n.t(LabCommands.MergeCellAbove.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.MergeCellBelow.id,
       command: LabCommands.MergeCellBelow.id,
-      label: LabCommands.MergeCellBelow.label,
+      label: () => <div>{l10n.t(LabCommands.MergeCellBelow.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.ClearCellOutput.id,
       command: LabCommands.ClearCellOutput.id,
-      label: LabCommands.ClearCellOutput.label,
+      label: () => <div>{l10n.t(LabCommands.ClearCellOutput.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.EDIT, {
       id: LabCommands.ClearAllCellOutput.id,
       command: LabCommands.ClearAllCellOutput.id,
-      label: LabCommands.ClearAllCellOutput.label,
+      label: () => <div>{l10n.t(LabCommands.ClearAllCellOutput.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.VIEW, {
       id: LabCommands.HideOrShowCellCode.id,
       command: LabCommands.HideOrShowCellCode.id,
-      label: LabCommands.HideOrShowCellCode.label,
+      label: () => <div>{l10n.t(LabCommands.HideOrShowCellCode.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.VIEW, {
       id: LabCommands.HideOrShowOutputs.id,
       command: LabCommands.HideOrShowOutputs.id,
-      label: LabCommands.HideOrShowOutputs.label,
+      label: () => <div>{l10n.t(LabCommands.HideOrShowOutputs.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.VIEW, {
       id: LabCommands.EnableOutputScrolling.id,
       command: LabCommands.EnableOutputScrolling.id,
-      label: LabCommands.EnableOutputScrolling.label,
+      label: () => <div>{l10n.t(LabCommands.EnableOutputScrolling.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.VIEW, {
       id: LabCommands.DisableOutputScrolling.id,
       command: LabCommands.DisableOutputScrolling.id,
-      label: LabCommands.DisableOutputScrolling.label,
+      label: () => <div>{l10n.t(LabCommands.DisableOutputScrolling.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RunCell.id,
       command: LabCommands.RunCell.id,
-      label: LabCommands.RunCell.label,
+      label: () => <div>{l10n.t(LabCommands.RunCell.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RunAllAbove.id,
       command: LabCommands.RunAllAbove.id,
-      label: LabCommands.RunAllAbove.label,
+      label: () => <div>{l10n.t(LabCommands.RunAllAbove.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RunAllBelow.id,
       command: LabCommands.RunAllBelow.id,
-      label: LabCommands.RunAllBelow.label,
+      label: () => <div>{l10n.t(LabCommands.RunAllBelow.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RunAllCells.id,
       command: LabCommands.RunAllCells.id,
-      label: LabCommands.RunAllCells.label,
+      label: () => <div>{l10n.t(LabCommands.RunAllCells.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RunCellAndSelectNext.id,
       command: LabCommands.RunCellAndSelectNext.id,
-      label: LabCommands.RunCellAndSelectNext.label,
+      label: () => <div>{l10n.t(LabCommands.RunCellAndSelectNext.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RunCellAndInsertBelow.id,
       command: LabCommands.RunCellAndInsertBelow.id,
-      label: LabCommands.RunCellAndInsertBelow.label,
+      label: () => <div>{l10n.t(LabCommands.RunCellAndInsertBelow.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RestartRunAll.id,
       command: LabCommands.RestartRunAll.id,
-      label: LabCommands.RestartRunAll.label,
+      label: () => <div>{l10n.t(LabCommands.RestartRunAll.label)}</div>,
     });
     menu.registerMenuAction(LabMenus.RUN, {
       id: LabCommands.RestartAndRunToSelected.id,
       command: LabCommands.RestartAndRunToSelected.id,
-      label: LabCommands.RestartAndRunToSelected.label,
+      label: () => <div>{l10n.t(LabCommands.RestartAndRunToSelected.label)}</div>,
     });
   }
   registerCommands(commands: CommandRegistry) {

package/src/command/menu-bar-view.tsx

@@ -7,6 +7,7 @@ import {
   singleton,
   view,
 } from '@difizen/mana-app';
+import { l10n } from '@difizen/mana-l10n';
 import { forwardRef } from 'react';
 
 export const ManaMenubarComponent = forwardRef(function GithubLinkComponent() {
@@ -22,7 +23,7 @@ export class MenuBarView extends BaseView {
   constructor() {
     super();
     this.title.icon = MacCommandOutlined;
-    this.title.label = '菜单';
+    this.title.label = () => <div>{l10n.t('菜单')}</div>;
     this.id = 'menu-bar';
   }
 }

package/src/common/icon.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
 import { CodeFilled } from '@ant-design/icons';
 import './index.less';
 
@@ -90,7 +89,6 @@ export function Loadding(props: IProps) {
       xmlnsXlink="http://www.w3.org/1999/xlink"
       className="libro-lab-loadding"
     >
-      <title>形状结合</title>
       <g id="整体框架部分" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
         <g
           id="1.1容器加载中-关闭提示"
@@ -121,7 +119,6 @@ export function TerminalIcon(props: IProps) {
       xmlns="http://www.w3.org/2000/svg"
       xmlnsXlink="http://www.w3.org/1999/xlink"
     >
-      <title>编组</title>
       <g id="整体框架部分" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
         <g
           id="1.2容器加载完成"
@@ -202,7 +199,6 @@ export function PreferenceIcon(props: IProps) {
       xmlns="http://www.w3.org/2000/svg"
       xmlnsXlink="http://www.w3.org/1999/xlink"
     >
-      <title>政策</title>
       <g
         id="整体框架部分"
         stroke="none"
@@ -246,7 +242,6 @@ export function KeybindIcon(props: IProps) {
       xmlns="http://www.w3.org/2000/svg"
       xmlnsXlink="http://www.w3.org/1999/xlink"
     >
-      <title>键盘</title>
       <g
         id="整体框架部分"
         stroke="none"
@@ -295,7 +290,6 @@ export function SuccIcon(props: IProps) {
       xmlnsXlink="http://www.w3.org/1999/xlink"
       className="libro-lab-success"
     >
-      <title>编组 12</title>
       <g
         id="整体框架部分"
         stroke="none"
@@ -335,7 +329,6 @@ export function KernelAndTerminal() {
       xmlns="http://www.w3.org/2000/svg"
       xmlnsXlink="http://www.w3.org/1999/xlink"
     >
-      <title>app store-fill</title>
       <g
         id="代码片段"
         stroke="none"
@@ -381,7 +374,6 @@ export function openedPage() {
       xmlns="http://www.w3.org/2000/svg"
       xmlnsXlink="http://www.w3.org/1999/xlink"
     >
-      <title>广告主流水@2x</title>
       <g
         id="kernel管理面板"
         stroke="none"