fix: 支持单独翻译时间戳 close #1281

OpportunityLiu · OpportunityLiu · commit 8f9d37458fa7 · 2024-12-05T22:42:29.000+08:00
diff --git a/src/plugin/syringe/index.ts b/src/plugin/syringe/index.ts
@@ -140,7 +140,7 @@ class TagNodeRef {
             else value = `${this.service.tagging.ns(originalNs)}:${value}`;
         }
         this.node.innerHTML = value;
-        this.node.setAttribute('lang', 'cmn-Hans');
+        this.node.setAttribute('lang', 'zh-hans');
         return true;
     }
 }
@@ -308,7 +308,7 @@ export class Syringe {
             node.classList.add('ehs-translate-tag');
         }
         if (this.config.translateUi) {
-            node.setAttribute('lang', 'cmn-Hans');
+            node.setAttribute('lang', 'zh-hans');
         } else {
             node.setAttribute('lang', 'en');
         }
@@ -325,7 +325,7 @@ export class Syringe {
 
         const handled = this.translateTag(node);
         /* tag 处理过的ui不再处理*/
-        if (!handled && this.config.translateUi) {
+        if (!handled && (this.config.translateUi || this.config.translateTimestamp)) {
             this.translateUi(node);
         }
     }
@@ -382,17 +382,20 @@ export class Syringe {
     }
 
     private translateUiText(text: string): string | undefined {
-        const plain = this.uiData.plainReplacements.get(text);
-        if (plain != null) return plain;
-
         let repText = text;
-        for (const [k, v] of this.uiData.regexReplacements) {
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            repText = repText.replace(k, v as (substring: string, ...args: any[]) => string);
+
+        if (this.config.translateUi) {
+            const plain = this.uiData.plainReplacements.get(text);
+            if (plain != null) return plain;
+
+            for (const [k, v] of this.uiData.regexReplacements) {
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                repText = repText.replace(k, v as (substring: string, ...args: any[]) => string);
+            }
         }
 
         if (
-            this.config.translateTimestamp !== false &&
+            this.config.translateTimestamp &&
             // 快速判断是否有可能包含时间戳
             repText.includes(':')
         ) {
@@ -486,7 +489,7 @@ export class Syringe {
         }
 
         if (isElement(node, 'p') && node.classList.contains('gpc')) {
-            /* 兼容熊猫书签，单独处理页码，保留原页码Element，防止熊猫书签取不到报错 */
+            /* 兼容熊猫书签，单独处理页码，保留原页码 Element，防止熊猫书签取不到报错 */
             this.cloneAndPrependElement(node);
         }
 
diff --git a/src/user-script/popup-host.ts b/src/user-script/popup-host.ts
@@ -119,7 +119,7 @@ export function createPopup(): void {
     setBadge({ text: '' });
     const popupBack = document.body.appendChild(document.createElement('div'));
     popupBack.id = 'eh-syringe-popup-back';
-    popupBack.lang = 'cmn-Hans';
+    popupBack.lang = 'zh-hans';
     const popup = popupBack.appendChild(document.createElement('div'));
     popup.id = 'eh-syringe-popup';
 
diff --git a/src/web-ext/popup.html b/src/web-ext/popup.html
@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="cmn-Hans">
+<html lang="zh-hans">
     <head>
         <meta charset="UTF-8" />
         <title><%= htmlWebpackPlugin.options.title %></title>

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ class TagNodeRef {`
`140`	`140`	else value = `${this.service.tagging.ns(originalNs)}:${value}`;
`141`	`141`	`}`
`142`	`142`	`this.node.innerHTML = value;`
`143`		`- this.node.setAttribute('lang', 'cmn-Hans');`
	`143`	`+ this.node.setAttribute('lang', 'zh-hans');`
`144`	`144`	`return true;`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -308,7 +308,7 @@ export class Syringe {`
`308`	`308`	`node.classList.add('ehs-translate-tag');`
`309`	`309`	`}`
`310`	`310`	`if (this.config.translateUi) {`
`311`		`- node.setAttribute('lang', 'cmn-Hans');`
	`311`	`+ node.setAttribute('lang', 'zh-hans');`
`312`	`312`	`} else {`
`313`	`313`	`node.setAttribute('lang', 'en');`
`314`	`314`	`}`
`@@ -325,7 +325,7 @@ export class Syringe {`
`325`	`325`
`326`	`326`	`const handled = this.translateTag(node);`
`327`	`327`	`/* tag 处理过的ui不再处理*/`
`328`		`- if (!handled && this.config.translateUi) {`
	`328`	`+ if (!handled && (this.config.translateUi \|\| this.config.translateTimestamp)) {`
`329`	`329`	`this.translateUi(node);`
`330`	`330`	`}`
`331`	`331`	`}`
`@@ -382,17 +382,20 @@ export class Syringe {`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`private translateUiText(text: string): string \| undefined {`
`385`		`- const plain = this.uiData.plainReplacements.get(text);`
`386`		`- if (plain != null) return plain;`
`387`		`-`
`388`	`385`	`let repText = text;`
`389`		`- for (const [k, v] of this.uiData.regexReplacements) {`
`390`		`- // eslint-disable-next-line @typescript-eslint/no-explicit-any`
`391`		`- repText = repText.replace(k, v as (substring: string, ...args: any[]) => string);`
	`386`	`+`
	`387`	`+ if (this.config.translateUi) {`
	`388`	`+ const plain = this.uiData.plainReplacements.get(text);`
	`389`	`+ if (plain != null) return plain;`
	`390`	`+`
	`391`	`+ for (const [k, v] of this.uiData.regexReplacements) {`
	`392`	`+ // eslint-disable-next-line @typescript-eslint/no-explicit-any`
	`393`	`+ repText = repText.replace(k, v as (substring: string, ...args: any[]) => string);`
	`394`	`+ }`
`392`	`395`	`}`
`393`	`396`
`394`	`397`	`if (`
`395`		`- this.config.translateTimestamp !== false &&`
	`398`	`+ this.config.translateTimestamp &&`
`396`	`399`	`// 快速判断是否有可能包含时间戳`
`397`	`400`	`repText.includes(':')`
`398`	`401`	`) {`
`@@ -486,7 +489,7 @@ export class Syringe {`
`486`	`489`	`}`
`487`	`490`
`488`	`491`	`if (isElement(node, 'p') && node.classList.contains('gpc')) {`
`489`		`- /* 兼容熊猫书签，单独处理页码，保留原页码Element，防止熊猫书签取不到报错 */`
	`492`	`+ /* 兼容熊猫书签，单独处理页码，保留原页码 Element，防止熊猫书签取不到报错 */`
`490`	`493`	`this.cloneAndPrependElement(node);`
`491`	`494`	`}`
`492`	`495`