Merge branch 'master' of github.com:Paw-SQL/pawsql-vscode-plguin

Author: lhy

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-All notable changes to the "pawsql" extension will be documented in this file.
+All notable changes to the "PawSQL Client" extension will be documented in this file.
 
 Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
 

LICENSE.txt

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 - present PawSQL
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

PRIVACY.md

@@ -0,0 +1,3 @@
+# Data Collection
+
+The software may collect information about you and your use of the software. PawSQL may use this information to provide services and improve our products and services. You may turn off the telemetry as described in the repository. There are also some features in the software that may enable you and PawSQL to collect data from users of your applications. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of PawSQL's privacy statement. Our privacy statement is located at <https://pawsql.com/privacy>. You can learn more about data collection and use in the help documentation and our privacy statement. Your use of the software operates as your consent to these practices.

package-lock.json

@@ -1,8 +1,9 @@
+
 {
-  "name": "pawsql.client",
-  "displayName": "%extension.display name%",
+  "name": "pawsqlClient",
+  "displayName": "%extension.display.name%",
   "description": "%extension.description%",
-  "publisher": "PawSQL Team",
+  "publisher": "pawsql",
   "version": "0.0.1",
   "engines": {
     "vscode": "^1.80.0"
@@ -165,9 +166,6 @@
           },
           "pawsql.fileWorkspaceMappings": {
             "type": "object",
-            "title": "%config.workspace.fileMapping.title%",
-            "description": "%config.workspace.fileMapping.description%",
-            "markdownDescription": "%config.workspace.fileMapping.markdownDescription%",
             "default": {}
           }
         }
@@ -226,7 +224,7 @@
     "@types/node": "^16.0.0",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.0",
-    "@types/vscode": "^1.95.0",
+    "@types/vscode": "~1.80.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",
     "css-loader": "^7.1.2",
@@ -249,5 +247,12 @@
     "react-intl": "^6.8.7",
     "supports-color": "^9.4.0",
     "vscode-nls": "^5.2.0"
+  },  
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Paw-SQL/pawsql-vscode-plugin.git"
+  },
+  "bugs": {
+    "url": "https://github.com/Paw-SQL/pawsql-vscode-plugin/issues"
   }
 }

package.json

@@ -1,5 +1,5 @@
 {
-  "extension.display name": "PawSQL Client",
+  "extension.display.name": "PawSQL Client",
   "extension.description": "SQL Optimizer, Index Advisor for MySQL/PostgreSQL/Oracle/openGauss and more, Tune SQL by Clicks",
   "commands.openSettings": "修改",
   "commands.refreshTree": "刷新",

package.nls.json

@@ -10,9 +10,9 @@
   "no.active.editor": "No active editor found.",
   "api.key.not.configured": "Please input a valid apikey.",
   "license.code.not.exist": "License code does not exist. Please contact the administrator to obtain it.",
-  "beta.analysis.over.limit": "Optimization quota is reached.",
-  "analysis.over.limit": "Optimization quota is reached.",
-  "plan.user.exceeded.maximum.opt.times": "The number of optimizations has exceeded the current plan limit. To continue using it, please upgrade your plan.",
+  "beta.analysis.over.limit": "Opt. quota runs out, please upgrade your plan.",
+  "analysis.over.limit": "Opt. quota runs out, please upgrade your plan.",
+  "plan.user.exceeded.maximum.opt.times": "Opt. quota runs out, please upgrade your plan.",
   "workspace.not.exist": "Workspace does not exist.",
   "workspace.has.no.analysis": "Workspace optimization list is empty",
   "analysis.not.exist": "Analysis does not exist.",
@@ -27,9 +27,9 @@
   "CONFIG_FILE_DEFAULT_WORKSPACE_PLACEHOLDER": "Setup a default workspace for PawSQL.",
   "OPTIMIZING_SQL": "$(sync~spin) Optimizing SQL...",
   "error.create.analysis.failed": "Fail to optimize",
-  "error.login.invalidCredentials": "PawSQL registration email or password is incorrect. Please check your PawSQL configuration to ensure that the information is correct.",
-  "error.backendUrl.invalid": "The PawSQL engine is not responding.",
-  "error.frontendUrl.invalid": "The PawSQL website is not responding.",
+  "error.login.invalidCredentials": "PawSQL Server authentication failed: incorrect email or password, please check your input.",
+  "error.backendUrl.invalid": "The PawSQL Server is not responding.",
+  "error.frontendUrl.invalid": "The PawSQL Server is not responding.",
   "license.code.not.valid": "The license code is invalid. Please contact the administrator.",
   "sidebar.workspace.manager": "Workspace Manager",
   "sidebar.show.statement.detail": "Show optimization details",

src/i18n/en.json

@@ -27,10 +27,10 @@
   "CONFIG_FILE_DEFAULT_WORKSPACE_PLACEHOLDER": "请选择一个工作空间作为当前SQL文件的默认工作空间",
   "OPTIMIZING_SQL": "$(sync~spin) 正在优化SQL...",
   "error.create.analysis.failed": "SQL优化失败",
-  "error.login.invalidCredentials": "PawSQL注册邮箱或密码错误。请检查您的PawSQL配置，确保信息正确无误。",
-  "error.backendUrl.invalid": "请检查 backendUrl 是否正确配置或服务器是否运行",
+  "error.login.invalidCredentials": "PawSQL权限验证错误, 请确认你的用户名密码信息输入无误。",
+  "error.backendUrl.invalid": "请检查您的PawSQL服务器地址是否输入正确或服务器是否运行",
   "error.frontendUrl.invalid": "请检查 frontendUrl 是否正确配置或服务器是否运行",
-  "license.code.not.valid": "许可证代码无效，请联系管理员获取",
+  "license.code.not.valid": "许可证代码无效，请联系PawSQL管理员获取",
   "sidebar.workspace.manager": "工作空间管理器",
   "sidebar.show.statement.detail": "展示语句优化详情",
   "sidebar.apiKey.label": "ApiKey",