🐛[bugfix] Model : Auth keyの復旧作業

model.py

@@ -81,6 +81,22 @@ class Model:
         del self.keyword_processor
         self.keyword_processor = KeywordProcessor()
 
+    def authenticationTranslator(self, fnc, choice_translator=None, auth_key=None):
+        if choice_translator == None:
+            choice_translator = config.CHOICE_TRANSLATOR
+        if auth_key == None:
+            auth_key = config.AUTH_KEYS[choice_translator]
+
+        result = self.translator.authentication(choice_translator, auth_key)
+        if result:
+            auth_keys = config.AUTH_KEYS
+            auth_keys[choice_translator] = auth_key
+            try:
+                fnc(auth_keys)
+            except:
+                pass
+        return result
+
     def startLogger(self):
         os_makedirs(os_path.join(os_path.dirname(sys.argv[0]), "logs"), exist_ok=True)
         logger = getLogger()
@@ -121,10 +137,32 @@ class Model:
             if source_lang in source_languages and target_lang in target_languages:
                 compatible_engines.append(engine)
         engine_name = compatible_engines[0]
+
+        if engine_name == "DeepL" and config.AUTH_KEYS["DeepL_API"] != None:
+            engine_name = "DeepL"
+
         return engine_name
 
+    def getTranslatorStatus(self):
+        return self.translator.translator_status[config.CHOICE_TRANSLATOR]
+
+    def getListTranslatorName(self):
+        return list(self.translator.translator_status.keys())
+
     def getInputTranslate(self, message):
         try:
+            if config.CHOICE_TRANSLATOR == "DeepL_API":
+                if config.TARGET_LANGUAGE == "English":
+                    if config.TARGET_COUNTRY in ["United States", "Canada", "Philippines"]:
+                        config.TARGET_LANGUAGE = "English American"
+                    else:
+                        config.TARGET_LANGUAGE = "English British"
+                elif config.TARGET_LANGUAGE in ["Portuguese"]:
+                    if config.TARGET_COUNTRY == "Portugal":
+                        config.TARGET_LANGUAGE = "Portuguese European"
+                    else:
+                        config.TARGET_LANGUAGE = "Portuguese Brazilian"
+
             translation = self.translator.translate(
                             translator_name=config.CHOICE_TRANSLATOR,
                             source_language=config.SOURCE_LANGUAGE,
@@ -137,6 +175,18 @@ class Model:
 
     def getOutputTranslate(self, message):
         try:
+            if config.CHOICE_TRANSLATOR == "DeepL_API":
+                if config.SOURCE_LANGUAGE == "English":
+                    if config.SOURCE_COUNTRY in ["United States", "Canada", "Philippines"]:
+                        config.SOURCE_LANGUAGE = "English American"
+                    else:
+                        config.SOURCE_LANGUAGE = "English British"
+                elif config.SOURCE_LANGUAGE in ["Portuguese"]:
+                    if config.SOURCE_COUNTRY == "Portugal":
+                        config.SOURCE_LANGUAGE = "Portuguese European"
+                    else:
+                        config.SOURCE_LANGUAGE = "Portuguese Brazilian"
+
             translation = self.translator.translate(
                             translator_name=config.CHOICE_TRANSLATOR,
                             source_language=config.TARGET_LANGUAGE,