👍[Update] Model : 不要な変数”translatorEngine”を削除
This commit is contained in:
22
config.py
22
config.py
@@ -6,7 +6,7 @@ from json import dump as json_dump
|
||||
import tkinter as tk
|
||||
from tkinter import font
|
||||
from languages import selectable_languages
|
||||
from models.translation.translation_languages import translatorEngine
|
||||
from models.translation.translation_languages import translation_lang
|
||||
from models.transcription.transcription_utils import getInputDevices, getDefaultInputDevice
|
||||
from models.translation.utils import ctranslate2_weights
|
||||
from utils import generatePercentageStringsList, isUniqueStrings
|
||||
@@ -155,7 +155,7 @@ class Config:
|
||||
|
||||
@CHOICE_INPUT_TRANSLATOR.setter
|
||||
def CHOICE_INPUT_TRANSLATOR(self, value):
|
||||
if value in translatorEngine:
|
||||
if value in list(translation_lang.keys()):
|
||||
self._CHOICE_INPUT_TRANSLATOR= value
|
||||
|
||||
@property
|
||||
@@ -164,7 +164,7 @@ class Config:
|
||||
|
||||
@CHOICE_OUTPUT_TRANSLATOR.setter
|
||||
def CHOICE_OUTPUT_TRANSLATOR(self, value):
|
||||
if value in translatorEngine:
|
||||
if value in list(translation_lang.keys()):
|
||||
self._CHOICE_OUTPUT_TRANSLATOR = value
|
||||
|
||||
# Save Json Data
|
||||
@@ -593,8 +593,8 @@ class Config:
|
||||
self._ENABLE_TRANSCRIPTION_SEND = False
|
||||
self._ENABLE_TRANSCRIPTION_RECEIVE = False
|
||||
self._ENABLE_FOREGROUND = False
|
||||
self._CHOICE_INPUT_TRANSLATOR = translatorEngine[0]
|
||||
self._CHOICE_OUTPUT_TRANSLATOR = translatorEngine[0]
|
||||
self._CHOICE_INPUT_TRANSLATOR = "CTranslate2"
|
||||
self._CHOICE_OUTPUT_TRANSLATOR = "CTranslate2"
|
||||
self._SOURCE_LANGUAGE = "Japanese"
|
||||
self._SOURCE_COUNTRY = "Japan"
|
||||
self._TARGET_LANGUAGE = "English"
|
||||
@@ -604,14 +604,14 @@ class Config:
|
||||
## Main Window
|
||||
self._SELECTED_TAB_NO = "1"
|
||||
self._SELECTED_TAB_YOUR_TRANSLATOR_ENGINES = {
|
||||
"1":translatorEngine[0],
|
||||
"2":translatorEngine[0],
|
||||
"3":translatorEngine[0],
|
||||
"1":"CTranslate2",
|
||||
"2":"CTranslate2",
|
||||
"3":"CTranslate2",
|
||||
}
|
||||
self._SELECTED_TAB_TARGET_TRANSLATOR_ENGINES = {
|
||||
"1":translatorEngine[0],
|
||||
"2":translatorEngine[0],
|
||||
"3":translatorEngine[0],
|
||||
"1":"CTranslate2",
|
||||
"2":"CTranslate2",
|
||||
"3":"CTranslate2",
|
||||
}
|
||||
self._SELECTED_TAB_YOUR_LANGUAGES = {
|
||||
"1":"Japanese\n(Japan)",
|
||||
|
||||
4
model.py
4
model.py
@@ -20,7 +20,7 @@ from models.transcription.transcription_recorder import SelectedMicRecorder, Sel
|
||||
from models.transcription.transcription_recorder import SelectedMicEnergyRecorder, SelectedSpeakeEnergyRecorder
|
||||
from models.transcription.transcription_transcriber import AudioTranscriber
|
||||
from models.xsoverlay.notification import xsoverlayForVRCT
|
||||
from models.translation.translation_languages import translatorEngine, translation_lang
|
||||
from models.translation.translation_languages import translation_lang
|
||||
from models.transcription.transcription_languages import transcription_lang
|
||||
from config import config
|
||||
|
||||
@@ -117,7 +117,7 @@ class Model:
|
||||
|
||||
def findTranslationEngines(self, source_lang, target_lang):
|
||||
compatible_engines = []
|
||||
for engine in translatorEngine:
|
||||
for engine in list(translation_lang.keys()):
|
||||
languages = translation_lang.get(engine, {}).get("source", {})
|
||||
if source_lang in languages and target_lang in languages:
|
||||
compatible_engines.append(engine)
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
translatorEngine = ["DeepL", "DeepL_API", "Google", "Bing", "Papago"]
|
||||
translation_lang = {}
|
||||
dict_deepl_languages = {
|
||||
'Arabic':'ar',
|
||||
|
||||
Reference in New Issue
Block a user