diff --git a/src/extensions/core/maskeditor.ts b/src/extensions/core/maskeditor.ts index c07a3d84de..f079548631 100644 --- a/src/extensions/core/maskeditor.ts +++ b/src/extensions/core/maskeditor.ts @@ -3976,13 +3976,19 @@ class UIManager { const mainImageFilename = new URL(mainImageUrl).searchParams.get('filename') ?? undefined - const combinedImageFilename = + let combinedImageFilename: string | null | undefined + if ( ComfyApp.clipspace?.combinedIndex !== undefined && - ComfyApp.clipspace?.imgs?.[ComfyApp.clipspace.combinedIndex]?.src - ? new URL( - ComfyApp.clipspace.imgs[ComfyApp.clipspace.combinedIndex].src - ).searchParams.get('filename') - : undefined + ComfyApp.clipspace?.imgs && + ComfyApp.clipspace.combinedIndex < ComfyApp.clipspace.imgs.length && + ComfyApp.clipspace.imgs[ComfyApp.clipspace.combinedIndex]?.src + ) { + combinedImageFilename = new URL( + ComfyApp.clipspace.imgs[ComfyApp.clipspace.combinedIndex].src + ).searchParams.get('filename') + } else { + combinedImageFilename = undefined + } const imageLayerFilenames = mainImageFilename !== undefined diff --git a/src/locales/es/commands.json b/src/locales/es/commands.json index e1163206cc..25d93f0476 100644 --- a/src/locales/es/commands.json +++ b/src/locales/es/commands.json @@ -243,7 +243,7 @@ "label": "Alternar panel inferior de controles de vista" }, "Workspace_ToggleBottomPanel_Shortcuts": { - "label": "Mostrar diálogo de combinaciones de teclas" + "label": "Mostrar diálogo de atajos de teclado" }, "Workspace_ToggleFocusMode": { "label": "Alternar Modo de Enfoque" diff --git a/src/locales/fr/main.json b/src/locales/fr/main.json index 5bf0434137..be8fd5a26a 100644 --- a/src/locales/fr/main.json +++ b/src/locales/fr/main.json @@ -1157,7 +1157,7 @@ "node": "Nœud", "panelControls": "Contrôles du panneau", "queue": "File d’attente", - "view": "Affichage", + "view": "Vue", "workflow": "Flux de travail" }, "viewControls": "Contrôles d’affichage" diff --git a/src/locales/ja/main.json b/src/locales/ja/main.json index 739c86491a..f5a6b2b0f5 100644 --- a/src/locales/ja/main.json +++ b/src/locales/ja/main.json @@ -1151,7 +1151,7 @@ "shortcuts": { "essentials": "基本", "keyboardShortcuts": "キーボードショートカット", - "manageShortcuts": "ショートカット管理", + "manageShortcuts": "ショートカットの管理", "noKeybinding": "キー割り当てなし", "subcategories": { "node": "ノード", diff --git a/src/locales/ko/main.json b/src/locales/ko/main.json index 25ec517383..1e164bc45c 100644 --- a/src/locales/ko/main.json +++ b/src/locales/ko/main.json @@ -808,7 +808,7 @@ "Restart": "재시작", "Save": "저장", "Save As": "다른 이름으로 저장", - "Show Keybindings Dialog": "단축키 대화상자 표시", + "Show Keybindings Dialog": "키 바인딩 대화상자 표시", "Show Settings Dialog": "설정 대화상자 표시", "Sign Out": "로그아웃", "Toggle Bottom Panel": "하단 패널 전환", @@ -1149,7 +1149,7 @@ "Workflow": "워크플로" }, "shortcuts": { - "essentials": "기본", + "essentials": "필수", "keyboardShortcuts": "키보드 단축키", "manageShortcuts": "단축키 관리", "noKeybinding": "단축키 없음", diff --git a/src/locales/ru/commands.json b/src/locales/ru/commands.json index 3488674ac4..c1bbae269a 100644 --- a/src/locales/ru/commands.json +++ b/src/locales/ru/commands.json @@ -240,7 +240,7 @@ "label": "Показать/скрыть основную нижнюю панель" }, "Workspace_ToggleBottomPanelTab_shortcuts-view-controls": { - "label": "Показать/скрыть нижнюю панель управления просмотром" + "label": "Показать или скрыть нижнюю панель управления просмотром" }, "Workspace_ToggleBottomPanel_Shortcuts": { "label": "Показать диалог клавиш" diff --git a/src/locales/ru/main.json b/src/locales/ru/main.json index dd222dc2f2..9d6f6c9d54 100644 --- a/src/locales/ru/main.json +++ b/src/locales/ru/main.json @@ -1152,7 +1152,7 @@ "essentials": "Основные", "keyboardShortcuts": "Горячие клавиши", "manageShortcuts": "Управление горячими клавишами", - "noKeybinding": "Нет привязки клавиши", + "noKeybinding": "Нет сочетания клавиш", "subcategories": { "node": "Узел", "panelControls": "Управление панелью", diff --git a/src/locales/zh/commands.json b/src/locales/zh/commands.json index 194e23e9e5..9b12e850a0 100644 --- a/src/locales/zh/commands.json +++ b/src/locales/zh/commands.json @@ -72,7 +72,7 @@ "label": "锁定视图" }, "Comfy_Canvas_ToggleMinimap": { - "label": "画布切换小地图" + "label": "畫布切換小地圖" }, "Comfy_Canvas_ToggleSelectedNodes_Bypass": { "label": "忽略/取消忽略选中节点" @@ -237,13 +237,13 @@ "label": "切换日志底部面板" }, "Workspace_ToggleBottomPanelTab_shortcuts-essentials": { - "label": "切换基本下方面板" + "label": "切換基本下方面板" }, "Workspace_ToggleBottomPanelTab_shortcuts-view-controls": { - "label": "切换检视控制底部面板" + "label": "切換檢視控制底部面板" }, "Workspace_ToggleBottomPanel_Shortcuts": { - "label": "显示快捷键对话框" + "label": "顯示快捷鍵對話框" }, "Workspace_ToggleFocusMode": { "label": "切换焦点模式" diff --git a/src/locales/zh/main.json b/src/locales/zh/main.json index 189eb1f913..7168ebb76a 100644 --- a/src/locales/zh/main.json +++ b/src/locales/zh/main.json @@ -410,7 +410,7 @@ "resetView": "重置视图", "selectMode": "选择模式", "toggleLinkVisibility": "切换连线可见性", - "toggleMinimap": "切换小地图", + "toggleMinimap": "切換小地圖", "zoomIn": "放大", "zoomOut": "缩小" }, @@ -746,7 +746,7 @@ "Bypass/Unbypass Selected Nodes": "忽略/取消忽略选定节点", "Canvas Toggle Link Visibility": "切换连线可见性", "Canvas Toggle Lock": "切换视图锁定", - "Canvas Toggle Minimap": "画布切换小地图", + "Canvas Toggle Minimap": "畫布切換小地圖", "Check for Updates": "检查更新", "Clear Pending Tasks": "清除待处理任务", "Clear Workflow": "清除工作流", @@ -808,21 +808,21 @@ "Restart": "重启", "Save": "保存", "Save As": "另存为", - "Show Keybindings Dialog": "显示快捷键对话框", + "Show Keybindings Dialog": "顯示快捷鍵對話框", "Show Settings Dialog": "显示设置对话框", "Sign Out": "退出登录", "Toggle Bottom Panel": "切换底部面板", - "Toggle Essential Bottom Panel": "切换基本下方面板", + "Toggle Essential Bottom Panel": "切換基本下方面板", "Toggle Focus Mode": "切换专注模式", "Toggle Logs Bottom Panel": "切换日志底部面板", - "Toggle Model Library Sidebar": "切换模型库侧边栏", - "Toggle Node Library Sidebar": "切换节点库侧边栏", - "Toggle Queue Sidebar": "切换队列侧边栏", + "Toggle Model Library Sidebar": "切換模型庫側邊欄", + "Toggle Node Library Sidebar": "切換節點庫側邊欄", + "Toggle Queue Sidebar": "切換佇列側邊欄", "Toggle Search Box": "切换搜索框", "Toggle Terminal Bottom Panel": "切换终端底部面板", "Toggle Theme (Dark/Light)": "切换主题(暗/亮)", - "Toggle View Controls Bottom Panel": "切换检视控制下方面板", - "Toggle Workflows Sidebar": "切换工作流程侧边栏", + "Toggle View Controls Bottom Panel": "切換檢視控制下方面板", + "Toggle Workflows Sidebar": "切換工作流程側邊欄", "Toggle the Custom Nodes Manager": "切换自定义节点管理器", "Toggle the Custom Nodes Manager Progress Bar": "切换自定义节点管理器进度条", "Undo": "撤销", @@ -1149,7 +1149,7 @@ "Workflow": "工作流" }, "shortcuts": { - "essentials": "基本", + "essentials": "基本功能", "keyboardShortcuts": "鍵盤快捷鍵", "manageShortcuts": "管理快捷鍵", "noKeybinding": "無快捷鍵", diff --git a/src/scripts/app.ts b/src/scripts/app.ts index fbb3c25bea..f905643fb1 100644 --- a/src/scripts/app.ts +++ b/src/scripts/app.ts @@ -385,8 +385,15 @@ export class ComfyApp { static pasteFromClipspace(node: LGraphNode) { if (ComfyApp.clipspace) { // image paste - const combinedImgSrc = - ComfyApp.clipspace.imgs?.[ComfyApp.clipspace.combinedIndex].src + let combinedImgSrc: string | undefined + if ( + ComfyApp.clipspace.combinedIndex !== undefined && + ComfyApp.clipspace.imgs && + ComfyApp.clipspace.combinedIndex < ComfyApp.clipspace.imgs.length + ) { + combinedImgSrc = + ComfyApp.clipspace.imgs[ComfyApp.clipspace.combinedIndex].src + } if (ComfyApp.clipspace.imgs && node.imgs) { if (node.images && ComfyApp.clipspace.images) { if (ComfyApp.clipspace['img_paste_mode'] == 'selected') {