feat: 实现剪切粘贴的国际化部分，忽略自动生成的类型定义文件

rxliuli · May 19, 2021 · bb1d3f2 · bb1d3f2
1 parent 71f93d4
commit bb1d3f2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 45 deletions.
diff --git a/apps/joplin-vscode-plugin/.gitignore b/apps/joplin-vscode-plugin/.gitignore
@@ -8,4 +8,5 @@ yarn-error.log
 dist
 .cache
 *.tgz
-.vscode/launch.json
+.vscode/launch.json
+src/i18n/index.d.ts
diff --git a/apps/joplin-vscode-plugin/src/i18n/en.json b/apps/joplin-vscode-plugin/src/i18n/en.json
@@ -25,5 +25,8 @@
   "file uploaded successfully": "file uploaded successfully",
   "No active editor": "No active editor",
   "Resource [{{title}}] does not exist": "Resource [{{title}}] does not exist",
-  "Resource does not exist": "Resource does not exist"
+  "Resource does not exist": "Resource does not exist",
+  "cut-success": "Cut successfully",
+  "paste-success": "Paste successfully",
+  "paste-error-canTPasteSub": "Can't paste into a subdirectory"
 }
diff --git a/apps/joplin-vscode-plugin/src/i18n/index.d.ts b/apps/joplin-vscode-plugin/src/i18n/index.d.ts
diff --git a/apps/joplin-vscode-plugin/src/i18n/zhCN.json b/apps/joplin-vscode-plugin/src/i18n/zhCN.json
@@ -24,5 +24,8 @@
   "Clipboard does not contain picture!": "剪贴板不包含图片",
   "file uploaded successfully": "文件上传成功",
   "No active editor": "当前没有激活的编辑器",
-  "Resource does not exist": "资源不存在"
+  "Resource does not exist": "资源不存在",
+  "cut-success": "剪切成功",
+  "paste-success": "粘贴成功",
+  "paste-error-canTPasteSub": "不能粘贴到子目录中"
 }
diff --git a/apps/joplin-vscode-plugin/src/service/JoplinNoteCommandService.ts b/apps/joplin-vscode-plugin/src/service/JoplinNoteCommandService.ts
@@ -441,6 +441,7 @@ export class JoplinNoteCommandService {
   cut(item: FolderOrNote = this.config.noteListTreeView.selection[0]) {
     console.log('joplinNote.cut: ', item)
     this.clipboard = item
+    vscode.window.showInformationMessage(i18n.t('cut-success'))
   }
 
   /**
@@ -461,15 +462,15 @@ export class JoplinNoteCommandService {
       const paths = await folderExtApi.path(item.id)
       console.log('paths: ', paths)
       if (paths.some((item) => item.id === clipboard.id)) {
-        console.log('不能移动到子目录')
+        vscode.window.showWarningMessage(i18n.t('paste-error-canTPasteSub'))
         return
       }
       await folderExtApi.move(clipboard.id, item.id)
     } else {
       await noteExtApi.move(clipboard.id, item.id)
     }
     await this.config.noteViewProvider.refresh()
-    console.log('粘贴完成')
+    vscode.window.showInformationMessage(i18n.t('paste-success'))
     this.clipboard = null
   }
 }