diff -r bbf3af40c223 -r b31f0d894b55 eric7/Plugins/PluginTranslator.py
--- a/eric7/Plugins/PluginTranslator.py Sun Jun 12 16:05:27 2022 +0200
+++ b/eric7/Plugins/PluginTranslator.py Mon Jun 13 16:39:53 2022 +0200
@@ -9,7 +9,7 @@
import os
-from PyQt6.QtCore import pyqtSignal, QObject, QCoreApplication, QDateTime, Qt
+from PyQt6.QtCore import pyqtSignal, QObject, QCoreApplication
from EricWidgets.EricApplication import ericApp
@@ -46,7 +46,9 @@
Module function to create the Translator configuration page.
@param configDlg reference to the configuration dialog
+ @type ConfigurationWidget
@return reference to the configuration page
+ @rtype TranslatorPage
"""
from UiExtensionPlugins.Translator.ConfigurationPage import TranslatorPage
page = TranslatorPage.TranslatorPage(translatorPluginObject)
@@ -58,6 +60,7 @@
Module function returning data as required by the configuration dialog.
@return dictionary containing the relevant data
+ @rtype dict
"""
icon = (
os.path.join("UiExtensionPlugins", "Translator", "icons", "flag-dark")
@@ -93,7 +96,8 @@
"""
Constructor
- @param ui reference to the user interface object (UI.UserInterface)
+ @param ui reference to the user interface object
+ @type UI.UserInterface
"""
super().__init__(ui)
self.__ui = ui
@@ -108,16 +112,16 @@
# service specific settings below
# DeepL
"DeeplKey": "",
- # Google
+ # Google V1
"GoogleEnableDictionary": False,
+ # Google V2
"GoogleV2Key": "",
- # IBM Watson Language Translator
+ # IBM Watson
"IbmUrl": "",
"IbmKey": "",
# Microsoft
"MsTranslatorKey": "",
- "MsAuthToken": "",
- "MsAuthTokenExpire": QDateTime(),
+ "MsTranslatorRegion": "",
# MyMemory
"MyMemoryKey": "",
"MyMemoryEmail": "",
@@ -135,7 +139,8 @@
"""
Public method to activate this plugin.
- @return tuple of None and activation status (boolean)
+ @return tuple of None and activation status
+ @rtype tuple of (None, bool)
"""
global error
error = "" # clear previous error
@@ -164,7 +169,9 @@
Public method to retrieve the various default settings.
@param key the key of the value to get
+ @type str
@return the requested setting
+ @rtype any
"""
return self.__defaults[key]
@@ -173,7 +180,9 @@
Public method to retrieve the various settings.
@param key the key of the value to get
+ @type str
@return the requested setting
+ @rtype any
"""
if key in ["EnabledLanguages"]:
return Preferences.toList(
@@ -183,16 +192,6 @@
return Preferences.toBool(
Preferences.getSettings().value(
self.PreferencesKey + "/" + key, self.__defaults[key]))
- elif key in ["MsAuthTokenExpire"]:
- value = Preferences.getSettings().value(
- self.PreferencesKey + "/" + key, self.__defaults[key])
- if isinstance(value, str):
- if value.startswith("@QDateTime"):
- # old value, replace with default
- value = self.__defaults[key]
- else:
- value = QDateTime.fromString(value, Qt.DateFormat.ISODate)
- return value
else:
return Preferences.getSettings().value(
self.PreferencesKey + "/" + key, self.__defaults[key])
@@ -201,19 +200,13 @@
"""
Public method to store the various settings.
- @param key the key of the setting to be set (string)
+ @param key the key of the setting to be set
+ @type str
@param value the value to be set
+ @type any
"""
- if key in ["MsAuthTokenExpire"]:
- Preferences.getSettings().setValue(
- self.PreferencesKey + "/" + key,
- value.toString(Qt.DateFormat.ISODate))
- else:
- Preferences.getSettings().setValue(
- self.PreferencesKey + "/" + key, value)
+ Preferences.getSettings().setValue(
+ self.PreferencesKey + "/" + key, value)
if key in ["EnabledLanguages"]:
self.updateLanguages.emit()
-
-#
-# eflag: noqa = M801
