Merge branch 'autoselect_deepl_auth' into UI_2.0

main.py

@@ -237,13 +237,11 @@ def callbackSetUiLanguage(value):
 # Translation Tab
 def callbackSetDeeplAuthkey(value):
     print("callbackSetDeeplAuthkey", str(value))
-    # config.AUTH_KEYS["DeepL(auth)"] = str(value)
-    # if len(value) > 0:
-    #     if model.authenticationTranslator(callbackSetAuthKeys, choice_translator="DeepL(auth)", auth_key=value) is True:
-    #         print_textbox(self.parent.textbox_message_log, "Auth key update completed", "INFO")
-    #         print_textbox(self.parent.textbox_message_system_log, "Auth key update completed", "INFO")
-    #     else:
-    #         pass
+    if len(value) > 0 and model.authenticationTranslator(callbackSetAuthKeys, choice_translator="DeepL(auth)", auth_key=value) is True:
+        config.CHOICE_TRANSLATOR = model.findTranslationEngine(config.SOURCE_LANGUAGE, config.TARGET_LANGUAGE)
+        view.printToTextbox_AuthenticationSuccess()
+    else:
+        view.printToTextbox_AuthenticationError()
 
 # Transcription Tab (Mic)
 def callbackSetMicHost(value):

model.py

@@ -78,7 +78,7 @@ class Model:
         if result:
             auth_keys = config.AUTH_KEYS
             auth_keys[choice_translator] = auth_key
-            fnc(auth_key)
+            fnc(auth_keys)
         return result
 
     def startLogger(self):
@@ -119,7 +119,11 @@ class Model:
             target_languages = translation_lang.get(engine, {}).get("target", {})
             if source_lang in source_languages and target_lang in target_languages:
                 compatible_engines.append(engine)
-        return compatible_engines[0]
+        engine_name = compatible_engines[0]
+
+        if engine_name == "DeepL(web)" and config.AUTH_KEYS["DeepL(auth)"] != None:
+            engine_name = "DeepL(auth)"
+        return engine_name
 
     def getTranslatorStatus(self):
         return self.translator.translator_status[config.CHOICE_TRANSLATOR]

models/translation/translation_languages.py

@@ -1,5 +1,4 @@
-# translatorEngine = ["DeepL(web)", "DeepL(auth)", "Google(web)", "Bing(web)"]
-translatorEngine = ["DeepL(web)", "Google(web)", "Bing(web)"]
+translatorEngine = ["DeepL(web)", "DeepL(auth)", "Google(web)", "Bing(web)"]
 translation_lang = {}
 dict_deepl_web_languages = {
     "Japanese":"JA",

view.py

@@ -360,6 +360,8 @@ class View():
     def printToTextbox_disableForeground(self):
         self._printToTextbox_Info("Stop foreground")
 
+    def printToTextbox_AuthenticationSuccess(self):
+        self._printToTextbox_Info("Auth key update completed")
 
     def printToTextbox_AuthenticationError(self):
         self._printToTextbox_Info("Auth Key or language setting is incorrect")