Update language.

source/core/asp/index.js

@@ -46,7 +46,8 @@ class ASP extends Base {
     let tag_s = '->|';
     let tag_e = '|<-';
 
-    let formatter = new this.format(this.__opts__['encode']);
+    // let formatter = new this.format(this.__opts__['encode']);
+    let formatter = Base.prototype.format(this.__opts__['encode']);
 
     // hex编码一次数据
     let hexCode = formatter['hex'](data['_']);

source/language/en.js

@@ -12,7 +12,7 @@ module.exports = {
     main: {
       title: 'AntSword',
       about: 'About',
-      plugin: 'Plugin center',
+      pluginStore: 'Plugin Store',
       settings: 'System setting',
       language: 'Language setting',
       aproxy: 'Proxy setting',
@@ -60,7 +60,8 @@ module.exports = {
       move: 'Move',
       search: 'Search',
       plugin: 'Plugins',
-      pluginCenter: 'Plugin center',
+      pluginDefault: 'Default',
+      pluginStore: 'Plugin Store',
       clearCache: 'Clear cache',
       clearAllCache: 'Clear all cache'
     },
@@ -79,7 +80,7 @@ module.exports = {
         title: 'Delete category',
         confirm: 'Are you sure to delete this category?',
         success: (category) => antSword.noxss(`Delete category(${category}) success!`),
-        error: (category, err) => antSword.noxss(`Delete category(${category}failed!<br/>${err}`)
+        error: (category, err) => antSword.noxss(`Delete category(${category}failed!\n${err}`)
       },
       rename: {
         title: 'Rename category',
@@ -113,7 +114,7 @@ module.exports = {
         },
         warning: 'Please enter the full!',
         success: 'Add shell success!',
-        error: (err) => antSword.noxss(`Add shell failed!<br/>${err}`)
+        error: (err) => antSword.noxss(`Add shell failed!\n${err}`)
       },
       edit: {
         title: (url) => antSword.noxss(`Edit shell(${url})`),
@@ -130,29 +131,29 @@ module.exports = {
         },
         warning: 'Please enter the full!',
         success: 'Update shell success!',
-        error: (err) => antSword.noxss(`Update shell failed!<br/>${err}`)
+        error: (err) => antSword.noxss(`Update shell failed!\n${err}`)
       },
       del: {
         title: 'Delete shell',
         confirm: (len) => antSword.noxss(`Are you sure to delete ${len} shells?`),
         success: (len) => antSword.noxss(`Delete ${len} shells success!`),
-        error: (err) => antSword.noxss(`Delete failed!<br/>${err}`)
+        error: (err) => antSword.noxss(`Delete failed!\n${err}`)
       },
       move: {
         success: (num) => antSword.noxss(`Move ${num}datas success!`),
-        error: (err) => antSword.noxss(`Move data failed!<br/>${err}`)
+        error: (err) => antSword.noxss(`Move data failed!\n${err}`)
       },
       clearCache: {
         title: 'Clear cache',
         confirm: 'Are you sure to clear this cache?',
         success: 'Clear cache success!',
-        error: (err) => antSword.noxss(`Clear cache failed!<br/>${err}`)
+        error: (err) => antSword.noxss(`Clear cache failed!\n${err}`)
       },
       clearAllCache: {
         title: 'Clear all cache',
         confirm: 'Are you sure to clear all the cache?',
         success: 'Clear all cache success!',
-        error: (err) => antSword.noxss(`Clear all cache failed!<br/>${err}`)
+        error: (err) => antSword.noxss(`Clear all cache failed!\n${err}`)
       }
     }
   },
@@ -172,33 +173,33 @@ module.exports = {
       title: 'Delete',
       confirm: (num) => antSword.noxss(`Are you sure to delete ${typeof(num) === 'number' ? num + ' files' : num} ?`),
       success: (path) => antSword.noxss(`Delete file [${path}] success!`),
-      error: (path, err) => antSword.noxss(`Delete file [${path}] failed!${err ? '<br/>' + err : ''}`)
+      error: (path, err) => antSword.noxss(`Delete file [${path}] failed!${err ? '\n' + err : ''}`)
     },
     paste: {
-      success: (path) => antSword.noxss(`Paste file success!<br/>${path}`),
-      error: (path, err) => antSword.noxss(`Paste file [${path}] failed!${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`Paste file success!\n${path}`),
+      error: (path, err) => antSword.noxss(`Paste file [${path}] failed!${err ? '\n' + err : ''}`)
     },
     rename: {
       title: 'Rename',
       success: 'Rename success!',
-      error: (err) => antSword.noxss(`Rename failed!${err ? '<br/>' + err : ''}`)
+      error: (err) => antSword.noxss(`Rename failed!${err ? '\n' + err : ''}`)
     },
     createFolder: {
       title: 'Create Folder',
       value: 'New Folder',
-      success: (path) => antSword.noxss(`Create folder success!<br/>${path}`),
-      error: (path, err) => antSword.noxss(`Create folder [${path}] failed!${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`Create folder success!\n${path}`),
+      error: (path, err) => antSword.noxss(`Create folder [${path}] failed!${err ? '\n' + err : ''}`)
     },
     createFile: {
       title: 'Create File',
       value: 'New File.txt',
-      success: (path) => antSword.noxss(`Create file success!<br/>${path}`),
-      error: (path, err) => antSword.noxss(`Create file [${path}] failed!${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`Create file success!\n${path}`),
+      error: (path, err) => antSword.noxss(`Create file [${path}] failed!${err ? '\n' + err : ''}`)
     },
     retime: {
       title: 'Retime File',
-      success: (path) => antSword.noxss(`Retime file success!<br/>${path}`),
-      error: (path, err) => antSword.noxss(`Retime file [${path}] failed!${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`Retime file success!\n${path}`),
+      error: (path, err) => antSword.noxss(`Retime file [${path}] failed!${err ? '\n' + err : ''}`)
     },
     wget: {
       title: 'Wget File',
@@ -217,7 +218,7 @@ module.exports = {
         failed: (err) => antSword.noxss(`Failed:${err}`),
         error: (err) => antSword.noxss(`Error:${err}`)
       },
-      success: (path) => antSword.noxss(`Upload file success!<br/>${path}`),
+      success: (path) => antSword.noxss(`Upload file success!\n${path}`),
       error: (path, err) => antSword.noxss(`Upload file [${path}] failed!${err}`),
     },
     folder: {
@@ -245,7 +246,7 @@ module.exports = {
       prompt: {
         add: {
           title: 'Add to bookmark',
-          success: (path) => antSword.noxss(`Add to bookmark success!<br/>${path}`),
+          success: (path) => antSword.noxss(`Add to bookmark success!\n${path}`),
         },
         remove: {
           title: 'Remove bookmark',
@@ -285,8 +286,8 @@ module.exports = {
           modify: 'Modify the file time',
           copy: {
             title: 'Copy',
-            warning: (id) => antSword.noxss(`Already add to clipboard!<br/>${id}`),
-            info: (id) => antSword.noxss(`Add file to the clipboard.<br/>${id}`)
+            warning: (id) => antSword.noxss(`Already add to clipboard!\n${id}`),
+            info: (id) => antSword.noxss(`Add file to the clipboard.\n${id}`)
           },
           create: {
             title: 'Create',
@@ -303,8 +304,8 @@ module.exports = {
         mode: 'Mode',
         encode: 'Encode'
       },
-      loadErr: (err) => antSword.noxss(`Load file error!<br/>${err}`),
-      success: (path) => antSword.noxss(`Save the file success!<br/>${path}`),
+      loadErr: (err) => antSword.noxss(`Load file error!\n${err}`),
+      success: (path) => antSword.noxss(`Save the file success!\n${path}`),
       error: (path, err) => antSword.noxss(`Save the file [${path}] failed!${err}`)
     },
     tasks: {
@@ -329,7 +330,7 @@ module.exports = {
         success: 'Download success!',
         error: (err) => antSword.noxss(`Error:${err}`)
       },
-      error: (name, err) => antSword.noxss(`Download file [${name}]error!<br/>${err}`),
+      error: (name, err) => antSword.noxss(`Download file [${name}]error!\n${err}`),
       success: (name) => antSword.noxss(`Download file [${name}] success!`)
     }
   },
@@ -352,10 +353,10 @@ module.exports = {
       title: 'Result',
       warning: 'Execution is completed, but no results return!',
       error: {
-        database: (err) => antSword.noxss(`Failed to obtain a list of databases!<br/>${err}`),
-        table: (err) => antSword.noxss(`Get table data failed!<br/>${err}`),
-        column: (err) => antSword.noxss(`Failed to obtain field list!<br/>${err}`),
-        query: (err) => antSword.noxss(`Failure to execute SQL!<br/>${err}`),
+        database: (err) => antSword.noxss(`Failed to obtain a list of databases!\n${err}`),
+        table: (err) => antSword.noxss(`Get table data failed!\n${err}`),
+        column: (err) => antSword.noxss(`Failed to obtain field list!\n${err}`),
+        query: (err) => antSword.noxss(`Failure to execute SQL!\n${err}`),
         parse: 'Return data format is incorrect!',
         noresult: 'No query results!'
       }
@@ -377,7 +378,7 @@ module.exports = {
         title: 'Delete configuration',
         confirm: 'Determine delete this configuration?',
         success: 'Delete configuration success!',
-        error: (err) => antSword.noxss(`Delete configuration failed!<br/>${err}`)
+        error: (err) => antSword.noxss(`Delete configuration failed!\n${err}`)
       }
     }
   },
@@ -411,7 +412,7 @@ module.exports = {
       },
       check: {
         ing: 'Check for updates..',
-        fail: (err) => `Check for update failed!<br/>${err}`,
+        fail: (err) => `Check for update failed!\n${err}`,
         none: (ver) => `After examination, no update![v${ver}]`,
         found: (ver) => `Found a new version [v${ver}]`
       },
@@ -502,6 +503,6 @@ module.exports = {
     }
   },
   plugin: {
-    error: (err) => antSword.noxss(`Load plugin center failed!<br/>${err}`)
+    error: (err) => antSword.noxss(`Load Plugin Store failed!\n${err}`)
   }
 }

source/language/zh.js

@@ -13,7 +13,7 @@ module.exports = {
     main: {
       title: 'AntSword',
       about: '关于程序',
-      plugin: '插件中心',
+      pluginStore: '插件市场',
       settings: '系统设置',
       language: '语言设置',
       aproxy: '代理设置',
@@ -61,7 +61,8 @@ module.exports = {
       move: '移动数据',
       search: '搜索数据',
       plugin: '加载插件',
-      pluginCenter: '插件中心',
+      pluginDefault: '默认分类',
+      pluginStore: '插件市场',
       clearCache: '清空缓存',
       clearAllCache: '清空所有缓存'
     },
@@ -80,7 +81,7 @@ module.exports = {
         title: '删除分类',
         confirm: '确定删除此分类吗？（数据将清空）',
         success: (category) => antSword.noxss(`成功删除分类（${category}）！`),
-        error: (category, err) => antSword.noxss(`删除分类（${category}）失败！<br/>${err}`)
+        error: (category, err) => antSword.noxss(`删除分类（${category}）失败！\n${err}`)
       },
       rename: {
         title: '重命名分类',
@@ -114,7 +115,7 @@ module.exports = {
         },
         warning: '请输入完整！',
         success: '添加数据成功！',
-        error: (err) => antSword.noxss(`添加数据失败！<br/>${err}`)
+        error: (err) => antSword.noxss(`添加数据失败！\n${err}`)
       },
       edit: {
         title: (url) => antSword.noxss(`编辑数据（${url}）`),
@@ -131,29 +132,29 @@ module.exports = {
         },
         warning: '请输入完整！',
         success: '更新数据成功！',
-        error: (err) => antSword.noxss(`更新数据失败！<br/>${err}`)
+        error: (err) => antSword.noxss(`更新数据失败！\n${err}`)
       },
       del: {
         title: '删除数据',
         confirm: (len) => antSword.noxss(`确定删除选中的${len}条数据吗？`),
         success: (len) => antSword.noxss(`成功删除${len}条数据！`),
-        error: (err) => antSword.noxss(`删除失败！<br/>${err}`)
+        error: (err) => antSword.noxss(`删除失败！\n${err}`)
       },
       move: {
         success: (num) => antSword.noxss(`成功移动${num}条数据！`),
-        error: (err) => antSword.noxss(`移动数据失败！<br/>${err}`)
+        error: (err) => antSword.noxss(`移动数据失败！\n${err}`)
       },
       clearCache: {
         title: '清空缓存',
         confirm: '确定清空此缓存吗？',
         success: '清空缓存完毕！',
-        error: (err) => antSword.noxss(`清空缓存失败！<br/>${err}`)
+        error: (err) => antSword.noxss(`清空缓存失败！\n${err}`)
       },
       clearAllCache: {
         title: '清空缓存',
         confirm: '确定清空所有缓存数据吗？',
         success: '清空全部缓存完毕！',
-        error: (err) => antSword.noxss(`清空全部缓存失败！<br/>${err}`)
+        error: (err) => antSword.noxss(`清空全部缓存失败！\n${err}`)
       }
     }
   },
@@ -172,34 +173,34 @@ module.exports = {
     delete: {
       title: '删除文件',
       confirm: (num) => antSword.noxss(`你确定要删除 ${typeof(num) === 'number' ? num + ' 个文件' : num} 吗？`),
-      success: (path) => antSword.noxss(`删除文件成功！<br/>${path}`),
-      error: (path, err) => antSword.noxss(`删除文件 [${path}] 失败！${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`删除文件成功！\n${path}`),
+      error: (path, err) => antSword.noxss(`删除文件 [${path}] 失败！${err ? '\n' + err : ''}`)
     },
     paste: {
-      success: (path) => antSword.noxss(`粘贴文件成功！<br/>${path}`),
-      error: (path, err) => antSword.noxss(`粘贴文件 [${path}] 失败！${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`粘贴文件成功！\n${path}`),
+      error: (path, err) => antSword.noxss(`粘贴文件 [${path}] 失败！${err ? '\n' + err : ''}`)
     },
     rename: {
       title: '重命名',
       success: '重命名文件成功！',
-      error: (err) => antSword.noxss(`重命名文件失败！${err ? '<br/>' + err : ''}`)
+      error: (err) => antSword.noxss(`重命名文件失败！${err ? '\n' + err : ''}`)
     },
     createFolder: {
       title: '新建目录',
       value: '新目录',
-      success: (path) => antSword.noxss(`新建目录成功！<br/>${path}`),
-      error: (path, err) => antSword.noxss(`新建目录 [${path}] 失败！${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`新建目录成功！\n${path}`),
+      error: (path, err) => antSword.noxss(`新建目录 [${path}] 失败！${err ? '\n' + err : ''}`)
     },
     createFile: {
       title: '新建文件',
       value: '新文件.txt',
-      success: (path) => antSword.noxss(`新建文件成功！<br/>${path}`),
-      error: (path, err) => antSword.noxss(`新建文件 [${path}] 失败！${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`新建文件成功！\n${path}`),
+      error: (path, err) => antSword.noxss(`新建文件 [${path}] 失败！${err ? '\n' + err : ''}`)
     },
     retime: {
       title: '更改时间',
-      success: (path) => antSword.noxss(`更改文件时间成功！<br/>${path}`),
-      error: (path, err) => antSword.noxss(`更改文件时间 [${path}] 失败！${err ? '<br/>' + err : ''}`)
+      success: (path) => antSword.noxss(`更改文件时间成功！\n${path}`),
+      error: (path, err) => antSword.noxss(`更改文件时间 [${path}] 失败！${err ? '\n' + err : ''}`)
     },
     wget: {
       title: 'Wget下载文件',
@@ -218,7 +219,7 @@ module.exports = {
         failed: (err) => antSword.noxss(`失败:${err}`),
         error: (err) => antSword.noxss(`出错:${err}`)
       },
-      success: (path) => antSword.noxss(`上传文件成功！<br/>${path}`),
+      success: (path) => antSword.noxss(`上传文件成功！\n${path}`),
       error: (path, err) => antSword.noxss(`上传文件 [${path}] 失败！${err}`),
     },
     folder: {
@@ -246,7 +247,7 @@ module.exports = {
       prompt: {
         add: {
           title: '添加到书签',
-          success: (path) => antSword.noxss(`添加书签成功！<br/>${path}`),
+          success: (path) => antSword.noxss(`添加书签成功！\n${path}`),
         },
         remove: {
           title: '移除书签',
@@ -286,8 +287,8 @@ module.exports = {
           modify: '更改文件时间',
           copy: {
             title: '复制文件',
-            warning: (id) => antSword.noxss(`已经添加到剪贴板！<br/>${id}`),
-            info: (id) => antSword.noxss(`添加文件到剪贴板<br/>${id}`)
+            warning: (id) => antSword.noxss(`已经添加到剪贴板！\n${id}`),
+            info: (id) => antSword.noxss(`添加文件到剪贴板\n${id}`)
           },
           create: {
             title: '新建',
@@ -304,8 +305,8 @@ module.exports = {
         mode: '高亮',
         encode: '编码'
       },
-      loadErr: (err) => antSword.noxss(`加载文件出错！<br/>${err}`),
-      success: (path) => antSword.noxss(`保存文件成功！<br/>${path}`),
+      loadErr: (err) => antSword.noxss(`加载文件出错！\n${err}`),
+      success: (path) => antSword.noxss(`保存文件成功！\n${path}`),
       error: (path, err) => antSword.noxss(`保存文件 [${path}] 失败！${err}`)
     },
     tasks: {
@@ -330,7 +331,7 @@ module.exports = {
         success: '下载成功',
         error: (err) => antSword.noxss(`出错:${err}`)
       },
-      error: (name, err) => antSword.noxss(`下载文件[${name}]出错！<br/>${err}`),
+      error: (name, err) => antSword.noxss(`下载文件[${name}]出错！\n${err}`),
       success: (name) => antSword.noxss(`下载文件[${name}]成功！`)
     }
   },
@@ -353,10 +354,10 @@ module.exports = {
       title: '执行结果',
       warning: '操作完毕，但没有结果返回！',
       error: {
-        database: (err) => antSword.noxss(`获取数据库列表失败！<br/>${err}`),
-        table: (err) => antSword.noxss(`获取表数据失败！<br/>${err}`),
-        column: (err) => antSword.noxss(`获取字段列表失败！<br/>${err}`),
-        query: (err) => antSword.noxss(`执行SQL失败！<br/>${err}`),
+        database: (err) => antSword.noxss(`获取数据库列表失败！\n${err}`),
+        table: (err) => antSword.noxss(`获取表数据失败！\n${err}`),
+        column: (err) => antSword.noxss(`获取字段列表失败！\n${err}`),
+        query: (err) => antSword.noxss(`执行SQL失败！\n${err}`),
         parse: '返回数据格式不正确！',
         noresult: '没有查询结果！'
       }
@@ -378,7 +379,7 @@ module.exports = {
         title: '删除配置',
         confirm: '确定删除此配置吗？',
         success: '删除配置成功！',
-        error: (err) => antSword.noxss(`删除配置失败！<br/>${err}`)
+        error: (err) => antSword.noxss(`删除配置失败！\n${err}`)
       }
     }
   },
@@ -412,7 +413,7 @@ module.exports = {
       },
       check: {
         ing: '检查更新中。。',
-        fail: (err) => `检查更新失败！<br/>${err}`,
+        fail: (err) => `检查更新失败！\n${err}`,
         none: (ver) => `检查完毕，暂无更新！【v${ver}】`,
         found: (ver) => `发现新版本【v${ver}】`
       },
@@ -470,6 +471,6 @@ module.exports = {
     }
   },
   plugin: {
-    error: (err) => antSword.noxss(`加载插件中心失败！<br/>${err}`)
+    error: (err) => antSword.noxss(`加载插件中心失败！\n${err}`)
   }
 }