diff options
author | fieldOfView <aldo@fieldofview.com> | 2018-10-03 23:00:24 +0300 |
---|---|---|
committer | fieldOfView <aldo@fieldofview.com> | 2018-10-03 23:00:24 +0300 |
commit | 9ac744b9ba33cacf767f9b9ba3873fef3bdb50bf (patch) | |
tree | a5265741dc61b8afb75ced366267ffd36f5f55ad | |
parent | 9986e38dca7fc1b91c0278f03993c478147368df (diff) |
Remove unnecessary import and declaration of i18n in plugins
-rw-r--r-- | plugins/3MFWriter/__init__.py | 2 | ||||
-rw-r--r-- | plugins/ChangeLogPlugin/__init__.py | 2 | ||||
-rw-r--r-- | plugins/FirmwareUpdateChecker/__init__.py | 4 | ||||
-rw-r--r-- | plugins/MachineSettingsAction/__init__.py | 2 | ||||
-rw-r--r-- | plugins/ModelChecker/__init__.py | 5 | ||||
-rw-r--r-- | plugins/MonitorStage/__init__.py | 1 | ||||
-rw-r--r-- | plugins/PostProcessingPlugin/__init__.py | 6 | ||||
-rw-r--r-- | plugins/RemovableDriveOutputDevice/__init__.py | 6 | ||||
-rw-r--r-- | plugins/SliceInfoPlugin/__init__.py | 7 | ||||
-rw-r--r-- | plugins/UM3NetworkPrinting/__init__.py | 3 | ||||
-rw-r--r-- | plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py | 3 | ||||
-rw-r--r-- | plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py | 3 | ||||
-rw-r--r-- | plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py | 3 | ||||
-rw-r--r-- | plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py | 3 | ||||
-rw-r--r-- | plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py | 1 | ||||
-rw-r--r-- | plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py | 1 | ||||
-rw-r--r-- | plugins/XmlMaterialProfile/__init__.py | 3 |
17 files changed, 11 insertions, 44 deletions
diff --git a/plugins/3MFWriter/__init__.py b/plugins/3MFWriter/__init__.py index 4b8a03888d..eff1648489 100644 --- a/plugins/3MFWriter/__init__.py +++ b/plugins/3MFWriter/__init__.py @@ -12,7 +12,7 @@ from . import ThreeMFWorkspaceWriter from UM.i18n import i18nCatalog from UM.Platform import Platform -i18n_catalog = i18nCatalog("uranium") +i18n_catalog = i18nCatalog("cura") def getMetaData(): workspace_extension = "3mf" diff --git a/plugins/ChangeLogPlugin/__init__.py b/plugins/ChangeLogPlugin/__init__.py index 97d9e411e5..a5452b60c8 100644 --- a/plugins/ChangeLogPlugin/__init__.py +++ b/plugins/ChangeLogPlugin/__init__.py @@ -3,8 +3,6 @@ from . import ChangeLog -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") def getMetaData(): return {} diff --git a/plugins/FirmwareUpdateChecker/__init__.py b/plugins/FirmwareUpdateChecker/__init__.py index 3fae15e826..892c9c0320 100644 --- a/plugins/FirmwareUpdateChecker/__init__.py +++ b/plugins/FirmwareUpdateChecker/__init__.py @@ -1,12 +1,8 @@ # Copyright (c) 2017 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from UM.i18n import i18nCatalog - from . import FirmwareUpdateChecker -i18n_catalog = i18nCatalog("cura") - def getMetaData(): return {} diff --git a/plugins/MachineSettingsAction/__init__.py b/plugins/MachineSettingsAction/__init__.py index b1c4a75fec..ff80a12551 100644 --- a/plugins/MachineSettingsAction/__init__.py +++ b/plugins/MachineSettingsAction/__init__.py @@ -3,8 +3,6 @@ from . import MachineSettingsAction -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") def getMetaData(): return {} diff --git a/plugins/ModelChecker/__init__.py b/plugins/ModelChecker/__init__.py index 5f4d443729..dffee21723 100644 --- a/plugins/ModelChecker/__init__.py +++ b/plugins/ModelChecker/__init__.py @@ -1,11 +1,8 @@ # Copyright (c) 2018 Ultimaker B.V. -# This example is released under the terms of the AGPLv3 or higher. +# Cura is released under the terms of the LGPLv3 or higher. from . import ModelChecker -from UM.i18n import i18nCatalog -i18n_catalog = i18nCatalog("cura") - def getMetaData(): return {} diff --git a/plugins/MonitorStage/__init__.py b/plugins/MonitorStage/__init__.py index 884d43a8af..bdaf53a36c 100644 --- a/plugins/MonitorStage/__init__.py +++ b/plugins/MonitorStage/__init__.py @@ -3,6 +3,7 @@ from . import MonitorStage
+
from UM.i18n import i18nCatalog
i18n_catalog = i18nCatalog("cura")
diff --git a/plugins/PostProcessingPlugin/__init__.py b/plugins/PostProcessingPlugin/__init__.py index 85f1126136..8064d1132a 100644 --- a/plugins/PostProcessingPlugin/__init__.py +++ b/plugins/PostProcessingPlugin/__init__.py @@ -2,10 +2,10 @@ # The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. from . import PostProcessingPlugin -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") + + def getMetaData(): return {} - + def register(app): return {"extension": PostProcessingPlugin.PostProcessingPlugin()}
\ No newline at end of file diff --git a/plugins/RemovableDriveOutputDevice/__init__.py b/plugins/RemovableDriveOutputDevice/__init__.py index dc547b7bcc..1758801f8a 100644 --- a/plugins/RemovableDriveOutputDevice/__init__.py +++ b/plugins/RemovableDriveOutputDevice/__init__.py @@ -3,12 +3,10 @@ from UM.Platform import Platform from UM.Logger import Logger -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") + def getMetaData(): - return { - } + return {} def register(app): if Platform.isWindows(): diff --git a/plugins/SliceInfoPlugin/__init__.py b/plugins/SliceInfoPlugin/__init__.py index 7f1dfa5336..440ca8ec40 100644 --- a/plugins/SliceInfoPlugin/__init__.py +++ b/plugins/SliceInfoPlugin/__init__.py @@ -1,12 +1,11 @@ # Copyright (c) 2015 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. + from . import SliceInfo -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") + def getMetaData(): - return { - } + return {} def register(app): return { "extension": SliceInfo.SliceInfo()}
\ No newline at end of file diff --git a/plugins/UM3NetworkPrinting/__init__.py b/plugins/UM3NetworkPrinting/__init__.py index 7f2b34223c..e2ad5a2b12 100644 --- a/plugins/UM3NetworkPrinting/__init__.py +++ b/plugins/UM3NetworkPrinting/__init__.py @@ -2,9 +2,6 @@ # Cura is released under the terms of the LGPLv3 or higher. from .src import DiscoverUM3Action -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - from .src import UM3OutputDevicePlugin def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py b/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py index 435621ec54..609781ebfe 100644 --- a/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade21to22/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade21to22 -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - upgrade = VersionUpgrade21to22.VersionUpgrade21to22() def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py b/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py index fbdbf92a4b..278b660ec1 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade
-from UM.i18n import i18nCatalog
-catalog = i18nCatalog("cura")
-
upgrade = VersionUpgrade.VersionUpgrade22to24()
def getMetaData():
diff --git a/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py b/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py index 1419325cc1..67aa73233f 100644 --- a/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade25to26/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade25to26 -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - upgrade = VersionUpgrade25to26.VersionUpgrade25to26() def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py b/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py index 79ed5e8b68..0e26ca8bbf 100644 --- a/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade26to27/__init__.py @@ -3,9 +3,6 @@ from . import VersionUpgrade26to27 -from UM.i18n import i18nCatalog -catalog = i18nCatalog("cura") - upgrade = VersionUpgrade26to27.VersionUpgrade26to27() def getMetaData(): diff --git a/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py b/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py index 4faa1290b5..8213f195d5 100644 --- a/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade33to34/__init__.py @@ -5,7 +5,6 @@ from . import VersionUpgrade33to34 upgrade = VersionUpgrade33to34.VersionUpgrade33to34() - def getMetaData(): return { "version_upgrade": { diff --git a/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py b/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py index 9d3410e40d..de0fdccb7d 100644 --- a/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade34to35/__init__.py @@ -5,7 +5,6 @@ from . import VersionUpgrade34to35 upgrade = VersionUpgrade34to35.VersionUpgrade34to35() - def getMetaData(): return { "version_upgrade": { diff --git a/plugins/XmlMaterialProfile/__init__.py b/plugins/XmlMaterialProfile/__init__.py index 70a359ee76..e8bde78424 100644 --- a/plugins/XmlMaterialProfile/__init__.py +++ b/plugins/XmlMaterialProfile/__init__.py @@ -5,10 +5,7 @@ from . import XmlMaterialProfile from . import XmlMaterialUpgrader from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase -from UM.i18n import i18nCatalog - -catalog = i18nCatalog("cura") upgrader = XmlMaterialUpgrader.XmlMaterialUpgrader() |