Mercurial Repositories > eric / changeset

--- a/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Mon Oct 01 19:20:42 2018 +0200
+++ b/Plugins/UiExtensionPlugins/Translator/TranslatorEngines/__init__.py	Tue Oct 02 19:47:59 2018 +0200
@@ -23,8 +23,11 @@
     
     @return names of supported engines (list of string)
     """
+    # TODO: port deepl to use the commercial API
+##    return ["googlev1", "mymemory", "glosbe", "promt", "yandex", "googlev2",
+##            "microsoft", "deepl", "ibm_watson"]
     return ["googlev1", "mymemory", "glosbe", "promt", "yandex", "googlev2",
-            "microsoft", "deepl", "ibm_watson"]
+            "microsoft", "ibm_watson"]
 
 
 def engineDisplayName(name):
@@ -48,8 +51,8 @@
         return QCoreApplication.translate("TranslatorEngines", "Google V.2")
     elif name == "microsoft":
         return QCoreApplication.translate("TranslatorEngines", "Microsoft")
-    elif name == "deepl":
-        return QCoreApplication.translate("TranslatorEngines", "DeepL")
+##    elif name == "deepl":
+##        return QCoreApplication.translate("TranslatorEngines", "DeepL")
     elif name == "ibm_watson":
         return QCoreApplication.translate("TranslatorEngines", "IBM Watson")
     else:
@@ -88,9 +91,9 @@
     elif name == "microsoft":
         from .MicrosoftEngine import MicrosoftEngine
         engine = MicrosoftEngine(plugin, parent)
-    elif name == "deepl":
-        from .DeepLEngine import DeepLEngine
-        engine = DeepLEngine(plugin, parent)
+##    elif name == "deepl":
+##        from .DeepLEngine import DeepLEngine
+##        engine = DeepLEngine(plugin, parent)
     elif name == "ibm_watson":
         from .IbmWatsonEngine import IbmWatsonEngine
         engine = IbmWatsonEngine(plugin, parent)
@@ -123,6 +126,7 @@
     @param name name of the online translation service (string)
     @return key request URL (string)
     """
+    # TODO: get URL for deepl
     if name == "mymemory":
         return "http://mymemory.translated.net/doc/keygen.php"
     elif name == "yandex":

--- a/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Mon Oct 01 19:20:42 2018 +0200
+++ b/Plugins/UiExtensionPlugins/Translator/TranslatorWidget.py	Tue Oct 02 19:47:59 2018 +0200
@@ -263,8 +263,8 @@
                 if index == -1:
                     index = 0
                 self.transLanguageComboBox.setCurrentIndex(index)
-            
-            self.__updateTranslateButton()
+        
+        self.__updateTranslateButton()
     
     @pyqtSlot(int)
     def on_transLanguageComboBox_currentIndexChanged(self, index):
@@ -323,6 +323,7 @@
         """
         self.__ensureTranslationEngineReady()
         
+        self.__updateTranslateButton()
         self.__updatePronounceButtons()
         
         self.__plugin.setPreferences(
@@ -355,6 +356,7 @@
         """
         enable = bool(self.origEdit.toPlainText())
         enable &= bool(self.__translationLanguage())
+        enable &= bool(self.__originalLanguage())
         self.translateButton.setEnabled(enable)
     
     def __translate(self, text, originalLanguage, translationLanguage):

--- a/Preferences/__init__.py	Mon Oct 01 19:20:42 2018 +0200
+++ b/Preferences/__init__.py	Tue Oct 02 19:47:59 2018 +0200
@@ -3287,8 +3287,11 @@
         return pwConvert(prefClass.settings.value(
             "User/" + key, prefClass.userDefaults[key]), encode=False)
     elif key in ["MailServerPort"]:
-        return int(prefClass.settings.value(
-            "User/" + key, prefClass.userDefaults[key]))
+        try:
+            return int(prefClass.settings.value(
+                "User/" + key, prefClass.userDefaults[key]))
+        except ValueError:
+            return prefClass.userDefaults[key]
     elif key in ["MailServerAuthentication", "UseSystemEmailClient",
                  "UseMasterPassword", "SavePasswords", "UseGoogleMailOAuth2"]:
         return toBool(prefClass.settings.value(