Fix: target_language code when deepl

jianchang512 · Oct 29, 2024 · fe4b08f · fe4b08f
1 parent 469a2ae
commit fe4b08f
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 13 deletions.
diff --git a/videotrans/__init__.py b/videotrans/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 
-VERSION = "v2.92"
-VERSION_NUM = 120092
+VERSION = "v2.94"
+VERSION_NUM = 120094
diff --git a/videotrans/recognition/_openai.py b/videotrans/recognition/_openai.py
@@ -86,6 +86,8 @@ def _exec(self) -> Union[List[Dict], None]:
                 if not config.settings['rephrase'] or self.detect_language[:2] !='zh':
                     jianfan=config.settings.get('zh_hant_s')
                     for i in alllist:
+                        if len(i['words'])<1:
+                            continue
                         tmp = {
                             'text': zhconv.convert(i['text'], 'zh-hans') if jianfan and self.detect_language[:2]=='zh' else i['text'],
                             'start_time': int(i['words'][0]['start'] * 1000),

diff --git a/videotrans/translator/_deepl.py b/videotrans/translator/_deepl.py
@@ -23,10 +23,17 @@ def _item_task(self, data: Union[List[str], str]) -> str:
 
         deepltranslator = deepl.Translator(config.params['deepl_authkey'], server_url=self.api_url, proxy=self.proxies)
         config.logger.info(f'[DeepL]请求数据:{data=},{config.params["deepl_gid"]=}')
+        target_code=self.target_code.upper()
+        if target_code=='EN':
+            target_code='EN-US'
+        elif target_code=='ZH-CN':
+            target_code='ZH-HANS'
+        elif target_code=='ZH-TW':
+            target_code='ZH-HANT'
         result = deepltranslator.translate_text(
                 "\n".join(data),
                 source_lang=self.source_code.upper()[:2] if self.source_code else None,
-                target_lang='EN-US' if self.target_code.lower() == 'en' else self.target_code,
+                target_lang=target_code,
                 glossary=config.params['deepl_gid'] if config.params['deepl_gid'] else None
             )
 

diff --git a/videotrans/translator/_deeplx.py b/videotrans/translator/_deeplx.py
@@ -34,10 +34,17 @@ def __init__(self, *args, **kwargs):
             self.proxies = {"http": "", "https": ""}
 
     def _item_task(self, data: Union[List[str], str]) -> str:
+        target_code=self.target_code.upper()
+        if target_code=='EN':
+            target_code='EN-US'
+        elif target_code=='ZH-CN':
+            target_code='ZH-HANS'
+        elif target_code=='ZH-TW':
+            target_code='ZH-HANT'
         jsondata = {
             "text": "\n".join(data),
             "source_lang": self.source_code.upper()[:2] if self.source_code else None,
-            "target_lang": 'EN-US' if self.target_code.lower() == 'en' else self.target_code
+            "target_lang": target_code
         }
         config.logger.info(f'[DeepLX]发送请求数据,{jsondata=}')
         response = requests.post(url=self.api_url, json=jsondata, proxies=self.proxies)

diff --git a/videotrans/ui/en.py b/videotrans/ui/en.py
@@ -379,6 +379,7 @@ def setupUi(self, MainWindow):
         self.voice_rate = QtWidgets.QSpinBox(self.layoutWidget)
         self.voice_rate.setMinimum(-50)
         self.voice_rate.setMaximum(50)
+        self.voice_rate.setMinimumSize(QtCore.QSize(50, 30))
         self.voice_rate.setObjectName("voice_rate")
 
         self.layout_voice_rate.setAlignment(Qt.AlignVCenter)

diff --git a/videotrans/winform/ai302.py b/videotrans/winform/ai302.py
@@ -20,7 +20,7 @@ def run(self):
         try:
             raw = "你好啊我的朋友"
             text = translator.run(translate_type=translator.AI302_INDEX, text_list=raw,
-                                  target_language_name="English" if config.defaulelang != 'zh' else "英语",
+                                  target_code="en",
                                   source_code="zh-cn",
                                   is_test=True)
             self.uito.emit(f"ok:{raw}\n{text}")

diff --git a/videotrans/winform/baidu.py b/videotrans/winform/baidu.py
@@ -19,7 +19,7 @@ def run(self):
                 text = translator.run(translate_type=translator.BAIDU_INDEX,
                                       text_list=raw,
                                       source_code="zh-cn",
-                                      target_language_name="en", is_test=True)
+                                      target_code="en", is_test=True)
                 self.uito.emit(f"ok:{raw}\n{text}")
             except Exception as e:
                 self.uito.emit(str(e))

diff --git a/videotrans/winform/chatgpt.py b/videotrans/winform/chatgpt.py
@@ -24,7 +24,7 @@ def run(self):
             try:
                 raw = "你好啊我的朋友"
                 text = translator.run(translate_type=translator.CHATGPT_INDEX, text_list=raw,
-                                      target_language_name="English" if config.defaulelang != 'zh' else "英语",
+                                      target_code="en",
                                       source_code="zh",
                                       is_test=True)
                 self.uito.emit(f"ok:{raw}\n{text}")

diff --git a/videotrans/winform/deepL.py b/videotrans/winform/deepL.py
@@ -20,7 +20,7 @@ def run(self):
                 raw = "你好啊我的朋友"
                 text = translator.run(translate_type=translator.DEEPL_INDEX,
                                       text_list=raw,
-                                      target_language_name="en",
+                                      target_code="en",
                                       source_code="zh-cn",
                                       is_test=True)
                 self.uito.emit(f"ok:{raw}\n{text}")

diff --git a/videotrans/winform/deepLX.py b/videotrans/winform/deepLX.py
@@ -18,7 +18,7 @@ def run(self):
                 text = translator.run(translate_type=translator.DEEPLX_INDEX,
                                       text_list=raw,
                                       source_code="zh-cn",
-                                      target_language_name="en",
+                                      target_code="en",
                                       is_test=True)
                 self.uito.emit(f"ok:{raw}\n{text}")
             except Exception as e:

diff --git a/videotrans/winform/localllm.py b/videotrans/winform/localllm.py
@@ -23,7 +23,7 @@ def run(self):
                 raw = "你好啊我的朋友"
                 text = translator.run(translate_type=translator.LOCALLLM_INDEX,
                                       text_list=raw,
-                                      target_language_name="English" if config.defaulelang != 'zh' else "英语",
+                                      target_code="en",
                                       source_code="zh-cn",
                                       is_test=True)
                 self.uito.emit(f"ok:{raw}\n{text}")

diff --git a/videotrans/winform/tencent.py b/videotrans/winform/tencent.py
@@ -18,7 +18,7 @@ def run(self):
                 text = translator.run(translate_type=translator.TENCENT_INDEX,
                                       text_list=raw,
                                       source_code="zh-cn",
-                                      target_language_name="en", is_test=True)
+                                      target_code="en", is_test=True)
                 self.uito.emit(f"ok:{raw}\n{text}")
             except Exception as e:
                 self.uito.emit(str(e))

diff --git a/videotrans/winform/transapi.py b/videotrans/winform/transapi.py
@@ -19,7 +19,7 @@ def run(self):
                 raw = "你好啊我的朋友"
                 text = translator.run(translate_type=translator.TRANSAPI_INDEX, text_list=raw,
                                       source_code='zh-cn',
-                                      target_language_name="en", is_test=True)
+                                      target_code="en", is_test=True)
                 self.uito.emit(f"ok:{raw}\n{str(text)}")
             except Exception as e:
                 self.uito.emit(str(e))

diff --git a/videotrans/winform/zijiehuoshan.py b/videotrans/winform/zijiehuoshan.py
@@ -20,7 +20,7 @@ def run(self):
             try:
                 raw = "你好啊我的朋友"
                 text = translator.run(translate_type=translator.ZIJIE_INDEX, text_list=raw,
-                                      target_language_name="英语" if config.defaulelang=='zh' else 'English',
+                                      target_code="en",
                                       source_code="zh-cn",
                                       is_test=True)
                 self.uito.emit(f"ok:{raw}\n{text}")