You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by wa...@apache.org on 2021/03/14 08:09:54 UTC
[echarts-bot] branch master updated: improve translator.
This is an automated email from the ASF dual-hosted git repository.
wangzx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/echarts-bot.git
The following commit(s) were added to refs/heads/master by this push:
new 21c1343 improve translator.
21c1343 is described below
commit 21c1343c21b9dfff3571cbb6b7b7686dd62762ca
Author: plainheart <yh...@all-my-life.cn>
AuthorDate: Sun Mar 14 16:09:21 2021 +0800
improve translator.
---
package-lock.json | 50 +++++++++++++++++++++++++++++++-------------------
package.json | 2 +-
src/translator.js | 14 ++++++++++----
3 files changed, 42 insertions(+), 24 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 6a517e0..25ba179 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "Apache-2.0",
"dependencies": {
- "@vitalets/google-translate-api": "^5.1.0",
+ "@plainheart/google-translate-api": "^1.1.0",
"bing-translate-api": "^1.0.3",
"franc-min": "^5.0.0",
"probot": "^11.1.0"
@@ -952,6 +952,16 @@
"debug": "^4.0.0"
}
},
+ "node_modules/@plainheart/google-translate-api": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@plainheart/google-translate-api/-/google-translate-api-1.1.0.tgz",
+ "integrity": "sha512-50k6gX5ARJmXscqcaoJuBTEzckYzjmEkp/Fjw8gifOmb9KQ3jEf7N4zkboJFuqUykhIHuF/UDPzDKOui3GR+PA==",
+ "dependencies": {
+ "configstore": "^5.0.1",
+ "got": "^9.6.0",
+ "lodash.clonedeep": "^4.5.0"
+ }
+ },
"node_modules/@probot/get-private-key": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@probot/get-private-key/-/get-private-key-1.1.0.tgz",
@@ -1415,15 +1425,6 @@
"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
"dev": true
},
- "node_modules/@vitalets/google-translate-api": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/@vitalets/google-translate-api/-/google-translate-api-5.1.0.tgz",
- "integrity": "sha512-iAfyAqLeBIhqJvS1PFAx6ve2bWTSS3/8L6ss+UKM0/Y7CHartgiMI7OWxSSRTdQDL1z/+SZNO3mJgdVTPcGAnA==",
- "dependencies": {
- "configstore": "^5.0.1",
- "got": "^9.6.0"
- }
- },
"node_modules/abab": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -6766,6 +6767,11 @@
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
"dev": true
},
+ "node_modules/lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+ },
"node_modules/lodash.defaults": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
@@ -11847,6 +11853,16 @@
"debug": "^4.0.0"
}
},
+ "@plainheart/google-translate-api": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/@plainheart/google-translate-api/-/google-translate-api-1.1.0.tgz",
+ "integrity": "sha512-50k6gX5ARJmXscqcaoJuBTEzckYzjmEkp/Fjw8gifOmb9KQ3jEf7N4zkboJFuqUykhIHuF/UDPzDKOui3GR+PA==",
+ "requires": {
+ "configstore": "^5.0.1",
+ "got": "^9.6.0",
+ "lodash.clonedeep": "^4.5.0"
+ }
+ },
"@probot/get-private-key": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/@probot/get-private-key/-/get-private-key-1.1.0.tgz",
@@ -12279,15 +12295,6 @@
"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
"dev": true
},
- "@vitalets/google-translate-api": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/@vitalets/google-translate-api/-/google-translate-api-5.1.0.tgz",
- "integrity": "sha512-iAfyAqLeBIhqJvS1PFAx6ve2bWTSS3/8L6ss+UKM0/Y7CHartgiMI7OWxSSRTdQDL1z/+SZNO3mJgdVTPcGAnA==",
- "requires": {
- "configstore": "^5.0.1",
- "got": "^9.6.0"
- }
- },
"abab": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
@@ -16602,6 +16609,11 @@
"integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==",
"dev": true
},
+ "lodash.clonedeep": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+ "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
+ },
"lodash.defaults": {
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz",
diff --git a/package.json b/package.json
index 9247562..c23958c 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
"test:watch": "jest --watch --notify --notifyMode=change --coverage"
},
"dependencies": {
- "@vitalets/google-translate-api": "^5.1.0",
+ "@plainheart/google-translate-api": "^1.1.0",
"bing-translate-api": "^1.0.3",
"franc-min": "^5.0.0",
"probot": "^11.1.0"
diff --git a/src/translator.js b/src/translator.js
index d9f3e33..4eca28c 100644
--- a/src/translator.js
+++ b/src/translator.js
@@ -1,4 +1,4 @@
-const googleTranslate = require('@vitalets/google-translate-api');
+const googleTranslate = require('@plainheart/google-translate-api');
const { translate: bingTranslate } = require('bing-translate-api')
const franc = require('franc-min');
@@ -8,12 +8,15 @@ async function translateByGoogle(rawContent) {
rawContent,
{
to: 'en',
- // tld: 'cn'
+ // tld: 'cn',
+ randomEndpoint: true
}
);
return {
translated: res.text,
- lang: res.from.language.iso
+ lang: res.from.language.iso,
+ endpoint: res.endpoint,
+ translator: 'google'
};
}
catch (e) {
@@ -48,7 +51,10 @@ async function translate(rawContent) {
const randomIdx = ~~(Math.random() * translators.length);
let res = await translators[randomIdx](rawContent);
if (!res) {
- for (let i = 0; i !== randomIdx && i < translators.length; i++) {
+ for (let i = 0; i < translators.length; i++) {
+ if (i === randomIdx) {
+ continue;
+ }
res = await translators[i](rawContent);
if (res) {
return res;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org