v1.8.3

.env

@@ -2,7 +2,7 @@ GENERATE_SOURCEMAP=false
 
 REACT_APP_NAME=KISS Translator
 REACT_APP_NAME_CN=简约翻译
-REACT_APP_VERSION=1.8.2
+REACT_APP_VERSION=1.8.3
 
 REACT_APP_HOMEPAGE=https://github.com/fishjar/kiss-translator
 

README.en.md

@@ -44,7 +44,7 @@ A simple, open source [bilingual translation extension & Greasemonkey script](ht
 > - Grease Monkey script will encounter more usage problems (cross domain issues, script conflicts, etc.)
 
 - [x] Browser extension
-  - [x] Chrome [Installation address](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
+  - [x] Chrome/Kiwi [Installation address](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
   - [x] Edge [Installation address](https://microsoftedge.microsoft.com/addons/detail/%E7%AE%80%E7%BA%A6%E7%BF%BB%E8%AF%91/jemckldkclkinpjighnoilpbldbdmmlh?hl=zh-CN)
   - [x] Firefox [Installation address](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/)
   - [ ] Safari

README.md

@@ -29,7 +29,7 @@
   - [x] 自定义专业术语
 - [x] 自定义译文样式
 - [x] 自定义快捷键
-  - `Alt+Q` 启停翻译
+  - `Alt+Q` 开启翻译
   - `Alt+C` 切换样式
   - `Alt+K` 打开设置弹窗
   - `Alt+S` 打开翻译弹窗/翻译选中文字
@@ -44,7 +44,7 @@
 > - 油猴脚本会遇到更多使用上的问题（跨域问题、脚本冲突等）
 
 - [x] 浏览器扩展
-  - [x] Chrome [安装地址](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
+  - [x] Chrome/Kiwi [安装地址](https://chrome.google.com/webstore/detail/kiss-translator/bdiifdefkgmcblbcghdlonllpjhhjgof?hl=zh-CN)
   - [x] Edge [安装地址](https://microsoftedge.microsoft.com/addons/detail/%E7%AE%80%E7%BA%A6%E7%BF%BB%E8%AF%91/jemckldkclkinpjighnoilpbldbdmmlh?hl=zh-CN)
   - [x] Firefox [安装地址](https://addons.mozilla.org/zh-CN/firefox/addon/kiss-translator/)
   - [ ] Safari

package.json

@@ -1,7 +1,7 @@
 {
   "name": "kiss-translator",
   "description": "A minimalist bilingual translation Extension & Greasemonkey Script",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "author": "Gabe<yugang2002@gmail.com>",
   "private": true,
   "dependencies": {

public/_locales/zh_CN/messages.json

@@ -6,7 +6,7 @@
     "message": "一个简约的双语对照翻译扩展 & 油猴脚本"
   },
   "toggle_translate": {
-    "message": "启停翻译"
+    "message": "开启翻译"
   },
   "toggle_style": {
     "message": "切换样式"

public/manifest.firefox.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_app_name__",
   "description": "__MSG_app_description__",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "default_locale": "en",
   "author": "Gabe<yugang2002@gmail.com>",
   "homepage_url": "https://github.com/fishjar/kiss-translator",

public/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_app_name__",
   "description": "__MSG_app_description__",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "default_locale": "en",
   "author": "Gabe<yugang2002@gmail.com>",
   "homepage_url": "https://github.com/fishjar/kiss-translator",

src/apis/index.js

@@ -196,7 +196,7 @@ export const apiTranslate = async ({
       break;
     case OPT_TRANS_GEMINI:
       trText = res?.candidates
-        ?.map((item) => item.content.parts.map((item) => item.text).join(" "))
+        ?.map((item) => item.content?.parts.map((item) => item.text).join(" "))
         .join(" ");
       isSame = text === trText;
       break;

src/background.js

@@ -40,7 +40,7 @@ async function addContextMenus(contextMenuType = 1) {
     case 1:
       browser.contextMenus.create({
         id: CMD_TOGGLE_TRANSLATE,
-        title: browser.i18n.getMessage("toggle_translate"),
+        title: browser.i18n.getMessage("app_name"),
         contexts: ["page", "selection"],
       });
       break;

src/common.js

@@ -14,7 +14,7 @@ import {
 } from "./config";
 import { getFabWithDefault, getSettingWithDefault } from "./libs/storage";
 import { Translator } from "./libs/translator";
-import { isIframe, sendIframeMsg, sendParentMsg } from "./libs/iframe";
+import { isIframe, sendIframeMsg } from "./libs/iframe";
 import Slection from "./views/Selection";
 import { touchTapListener } from "./libs/touch";
 import { debounce, genEventName } from "./libs/utils";
@@ -79,10 +79,9 @@ function runtimeListener(translator) {
 
 /**
  * iframe 页面执行
- * @param {*} setting
+ * @param {*} translator
  */
-function runIframe(setting) {
+function runIframe(translator) {
-  let translator;
   window.addEventListener("message", (e) => {
     const { action, args } = e.data || {};
     switch (action) {
@@ -93,16 +92,11 @@ function runIframe(setting) {
         translator?.toggleStyle();
         break;
       case MSG_TRANS_PUTRULE:
-        if (!translator) {
+        translator.updateRule(args || {});
-          translator = new Translator(args, setting);
-        } else {
-          translator.updateRule(args || {});
-        }
         break;
       default:
     }
   });
-  sendParentMsg(MSG_TRANS_GETRULE);
 }
 
 /**
@@ -174,22 +168,6 @@ function showTransbox({
   );
 }
 
-/**
- * 监听来自iframe页面消息
- * @param {*} rule
- */
-function windowListener(rule) {
-  window.addEventListener("message", (e) => {
-    const { action } = e.data || {};
-    switch (action) {
-      case MSG_TRANS_GETRULE:
-        sendIframeMsg(MSG_TRANS_PUTRULE, rule);
-        break;
-      default:
-    }
-  });
-}
-
 /**
  * 显示错误信息到页面顶部
  * @param {*} message
@@ -245,12 +223,6 @@ export async function run(isUserscript = false) {
       return;
     }
 
-    // 适配iframe
-    if (isIframe) {
-      runIframe(setting);
-      return;
-    }
-
     // 不规范网页修复
     const fixerSetting = await matchFixer(href, setting);
 
@@ -258,8 +230,13 @@ export async function run(isUserscript = false) {
     const rule = await matchRule(href, setting);
     const translator = new Translator(rule, setting, fixerSetting);
 
+    // 适配iframe
+    if (isIframe) {
+      runIframe(translator);
+      return;
+    }
+
     // 监听消息
-    windowListener(rule);
     !isUserscript && runtimeListener(translator);
 
     // 输入框翻译

src/config/i18n.js

@@ -376,7 +376,7 @@ export const I18N = {
     en: `1. Follow CSS selector syntax. 2. Leave blank to adopt the global setting. 3. Separate multiple CSS selectors with ";". 4. The "shadow root" selector and the internal selector are separated by ">>>".`,
   },
   translate_switch: {
-    zh: `启停翻译`,
+    zh: `开启翻译`,
     en: `Translate Switch`,
   },
   default_enabled: {
@@ -560,7 +560,7 @@ export const I18N = {
     en: `Shortcuts Setting`,
   },
   toggle_translate_shortcut: {
-    zh: `"启停翻译"快捷键`,
+    zh: `"开启翻译"快捷键`,
     en: `"Toggle Translate" Shortcut`,
   },
   toggle_style_shortcut: {

src/config/index.js

@@ -437,7 +437,7 @@ export const DEFAULT_BLACKLIST = [
   "https://translate.google.com",
   "https://www.deepl.com/translator",
   "oapi.dingtalk.com",
-  "login.dingtalk.com",
+  "login.dingtalk.com"
 ]; // 禁用翻译名单
 
 export const DEFAULT_SETTING = {

src/libs/translator.js

@@ -462,7 +462,12 @@ export class Translator {
       });
 
       if (keeps.length > 0) {
-        q = text;
+        // textContent会保留些无用的换行符，严重影响翻译质量
+        if (q.includes("\n")) {
+          q = text;
+        } else {
+          q = text.replaceAll("\n", " ");
+        }
       }
     }
 

src/views/Selection/DictCont.js

@@ -29,7 +29,7 @@ export default function DictCont({ dictResult }) {
       <Typography component="div">
         <Typography>
           {dictResult.voice
-            .map(Object.entries)
+            ?.map(Object.entries)
             .map((item) => item[0])
             .map(([key, val]) => `${phonicMap[key] || key} ${val}`)
             .join(" ")}