diff --git a/python/plugins/processing/gui/BatchInputSelectionPanel.py b/python/plugins/processing/gui/BatchInputSelectionPanel.py index 619887a74f9..8e12c6f09e9 100644 --- a/python/plugins/processing/gui/BatchInputSelectionPanel.py +++ b/python/plugins/processing/gui/BatchInputSelectionPanel.py @@ -27,7 +27,7 @@ __revision__ = '$Format:%H$' import os -from qgis.PyQt.QtCore import pyqtSignal +from qgis.PyQt.QtCore import pyqtSignal, QCoreApplication from qgis.PyQt.QtWidgets import QWidget, QHBoxLayout, QMenu, QPushButton, QLineEdit, QSizePolicy, QAction, QFileDialog from qgis.PyQt.QtGui import QCursor @@ -87,12 +87,12 @@ class BatchInputSelectionPanel(QWidget): if not (isinstance(self.param, QgsProcessingParameterMultipleLayers) and self.param.layerType == dataobjects.TYPE_FILE): selectLayerAction = QAction( - self.tr('Select from Open Layers…'), self.pushButton) + QCoreApplication.translate('BatchInputSelectionPanel', 'Select from Open Layers…'), self.pushButton) selectLayerAction.triggered.connect(self.showLayerSelectionDialog) popupmenu.addAction(selectLayerAction) selectFileAction = QAction( - self.tr('Select from File System…'), self.pushButton) + QCoreApplication.translate('BatchInputSelectionPanel', 'Select from File System…'), self.pushButton) selectFileAction.triggered.connect(self.showFileSelectionDialog) popupmenu.addAction(selectFileAction) diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py index 90f730b8dd1..b41c61f978d 100644 --- a/python/plugins/processing/gui/ProcessingToolbox.py +++ b/python/plugins/processing/gui/ProcessingToolbox.py @@ -232,19 +232,19 @@ class ProcessingToolbox(QgsDockWidget, WIDGET): popupmenu = QMenu() if isinstance(item, TreeAlgorithmItem): alg = item.alg - executeAction = QAction(self.tr('Execute…'), self.algorithmTree) + executeAction = QAction(QCoreApplication.translate('ProcessingToolbox', 'Execute…'), self.algorithmTree) executeAction.triggered.connect(self.executeAlgorithm) popupmenu.addAction(executeAction) if alg.flags() & QgsProcessingAlgorithm.FlagSupportsBatch: executeBatchAction = QAction( - self.tr('Execute as Batch Process…'), + QCoreApplication.translate('ProcessingToolbox', 'Execute as Batch Process…'), self.algorithmTree) executeBatchAction.triggered.connect( self.executeAlgorithmAsBatchProcess) popupmenu.addAction(executeBatchAction) popupmenu.addSeparator() editRenderingStylesAction = QAction( - self.tr('Edit Rendering Styles for Outputs…'), + QCoreApplication.translate('ProcessingToolbox', 'Edit Rendering Styles for Outputs…'), self.algorithmTree) editRenderingStylesAction.triggered.connect( self.editRenderingStyles) diff --git a/python/plugins/processing/modeler/AddModelFromFileAction.py b/python/plugins/processing/modeler/AddModelFromFileAction.py index 698ad5e9a06..e566597c7c9 100644 --- a/python/plugins/processing/modeler/AddModelFromFileAction.py +++ b/python/plugins/processing/modeler/AddModelFromFileAction.py @@ -28,7 +28,7 @@ __revision__ = '$Format:%H$' import os import shutil from qgis.PyQt.QtWidgets import QFileDialog, QMessageBox -from qgis.PyQt.QtCore import QFileInfo +from qgis.PyQt.QtCore import QFileInfo, QCoreApplication from qgis.core import QgsApplication, QgsSettings, QgsProcessingModelAlgorithm @@ -42,7 +42,7 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0] class AddModelFromFileAction(ToolboxAction): def __init__(self): - self.name = self.tr('Add Model from File…') + self.name = QCoreApplication.translate('AddModelFromFileAction', 'Add Model from File…') self.group = self.tr('Tools') def getIcon(self): diff --git a/python/plugins/processing/modeler/CreateNewModelAction.py b/python/plugins/processing/modeler/CreateNewModelAction.py index 6f3bb653f70..a2193ff7e64 100644 --- a/python/plugins/processing/modeler/CreateNewModelAction.py +++ b/python/plugins/processing/modeler/CreateNewModelAction.py @@ -27,6 +27,8 @@ __revision__ = '$Format:%H$' import os +from qgis.PyQt.QtCore import QCoreApplication + from qgis.core import QgsApplication from processing.gui.ToolboxAction import ToolboxAction @@ -38,7 +40,7 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0] class CreateNewModelAction(ToolboxAction): def __init__(self): - self.name = self.tr('Create New Model…') + self.name = QCoreApplication.translate('CreateNewModelAction', 'Create New Model…') self.group = self.tr('Tools') def getIcon(self): diff --git a/python/plugins/processing/modeler/DeleteModelAction.py b/python/plugins/processing/modeler/DeleteModelAction.py index f0a6253faa0..8266a6ed669 100644 --- a/python/plugins/processing/modeler/DeleteModelAction.py +++ b/python/plugins/processing/modeler/DeleteModelAction.py @@ -28,13 +28,14 @@ __revision__ = '$Format:%H$' import os from qgis.core import QgsApplication, QgsProcessingModelAlgorithm from qgis.PyQt.QtWidgets import QMessageBox +from qgis.PyQt.QtCore import QCoreApplication from processing.gui.ContextAction import ContextAction class DeleteModelAction(ContextAction): def __init__(self): - self.name = self.tr('Delete Model…', 'DeleteModelAction') + self.name = QCoreApplication.translate('DeleteModelAction', 'Delete Model…') def isEnabled(self): return isinstance(self.itemData, QgsProcessingModelAlgorithm) diff --git a/python/plugins/processing/modeler/EditModelAction.py b/python/plugins/processing/modeler/EditModelAction.py index 325c96f0db3..ef7652bec43 100644 --- a/python/plugins/processing/modeler/EditModelAction.py +++ b/python/plugins/processing/modeler/EditModelAction.py @@ -25,6 +25,7 @@ __copyright__ = '(C) 2012, Victor Olaya' __revision__ = '$Format:%H$' +from qgis.PyQt.QtCore import QCoreApplication from qgis.core import QgsApplication, QgsProcessingModelAlgorithm from processing.gui.ContextAction import ContextAction from processing.modeler.ModelerDialog import ModelerDialog @@ -33,7 +34,7 @@ from processing.modeler.ModelerDialog import ModelerDialog class EditModelAction(ContextAction): def __init__(self): - self.name = self.tr('Edit Model…', 'EditModelAction') + self.name = QCoreApplication.translate('EditModelAction', 'Edit Model…') def isEnabled(self): return isinstance(self.itemData, QgsProcessingModelAlgorithm) diff --git a/python/plugins/processing/modeler/OpenModelFromFileAction.py b/python/plugins/processing/modeler/OpenModelFromFileAction.py index cd9b3d7d1d4..f875cba6ea7 100644 --- a/python/plugins/processing/modeler/OpenModelFromFileAction.py +++ b/python/plugins/processing/modeler/OpenModelFromFileAction.py @@ -26,11 +26,10 @@ __copyright__ = '(C) 2018, Nyall Dawson' __revision__ = '$Format:%H$' import os -import shutil -from qgis.PyQt.QtWidgets import QFileDialog, QMessageBox -from qgis.PyQt.QtCore import QFileInfo +from qgis.PyQt.QtWidgets import QFileDialog +from qgis.PyQt.QtCore import QFileInfo, QCoreApplication -from qgis.core import QgsApplication, QgsSettings, QgsProcessingModelAlgorithm +from qgis.core import QgsApplication, QgsSettings from processing.gui.ToolboxAction import ToolboxAction from processing.modeler.ModelerDialog import ModelerDialog @@ -41,7 +40,7 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0] class OpenModelFromFileAction(ToolboxAction): def __init__(self): - self.name = self.tr('Open Existing Model…') + self.name = QCoreApplication.translate('OpenModelFromFileAction', 'Open Existing Model…') self.group = self.tr('Tools') def getIcon(self): diff --git a/python/plugins/processing/preconfigured/DeletePreconfiguredAlgorithmAction.py b/python/plugins/processing/preconfigured/DeletePreconfiguredAlgorithmAction.py index 0b2bbe058ff..e18aee3de43 100644 --- a/python/plugins/processing/preconfigured/DeletePreconfiguredAlgorithmAction.py +++ b/python/plugins/processing/preconfigured/DeletePreconfiguredAlgorithmAction.py @@ -26,6 +26,7 @@ __copyright__ = '(C) 2016, Victor Olaya' __revision__ = '$Format:%H$' import os +from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtWidgets import QMessageBox from qgis.core import QgsApplication from processing.gui.ContextAction import ContextAction @@ -35,7 +36,7 @@ from processing.preconfigured.PreconfiguredAlgorithm import PreconfiguredAlgorit class DeletePreconfiguredAlgorithmAction(ContextAction): def __init__(self): - self.name = self.tr('Delete Preconfigured Algorithm…', 'DeletePreconfiguredAlgorithmAction') + self.name = QCoreApplication.translate('DeletePreconfiguredAlgorithmAction', 'Delete Preconfigured Algorithm…') def isEnabled(self): return isinstance(self.itemData, PreconfiguredAlgorithm) diff --git a/python/plugins/processing/preconfigured/NewPreconfiguredAlgorithmAction.py b/python/plugins/processing/preconfigured/NewPreconfiguredAlgorithmAction.py index 3daec10d0b6..11ea9d07a20 100644 --- a/python/plugins/processing/preconfigured/NewPreconfiguredAlgorithmAction.py +++ b/python/plugins/processing/preconfigured/NewPreconfiguredAlgorithmAction.py @@ -26,6 +26,8 @@ __copyright__ = '(C) 2016, Victor Olaya' __revision__ = '$Format:%H$' +from qgis.PyQt.QtCore import QCoreApplication +from processing.core.GeoAlgorithm import GeoAlgorithm from processing.gui.ContextAction import ContextAction from processing.preconfigured.PreconfiguredAlgorithmDialog import PreconfiguredAlgorithmDialog from processing.preconfigured.PreconfiguredAlgorithm import PreconfiguredAlgorithm @@ -34,7 +36,7 @@ from processing.preconfigured.PreconfiguredAlgorithm import PreconfiguredAlgorit class NewPreconfiguredAlgorithmAction(ContextAction): def __init__(self): - self.name = self.tr('Create Preconfigured Algorithm…', 'NewPreconfiguredAlgorithmAction') + self.name = QCoreApplication.translate('NewPreconfiguredAlgorithmAction', 'Create Preconfigured Algorithm…') def isEnabled(self): return (isinstance(self.itemData, GeoAlgorithm) and diff --git a/python/plugins/processing/script/CreateNewScriptAction.py b/python/plugins/processing/script/CreateNewScriptAction.py index b4897447761..2b1e67e3827 100644 --- a/python/plugins/processing/script/CreateNewScriptAction.py +++ b/python/plugins/processing/script/CreateNewScriptAction.py @@ -27,6 +27,8 @@ __revision__ = '$Format:%H$' import os +from qgis.PyQt.QtCore import QCoreApplication + from qgis.core import QgsApplication from processing.gui.ToolboxAction import ToolboxAction @@ -37,7 +39,7 @@ from processing.script.ScriptEditorDialog import ScriptEditorDialog class CreateNewScriptAction(ToolboxAction): def __init__(self): - self.name = self.tr("Create New Script…") + self.name = QCoreApplication.translate("CreateNewScriptAction", "Create New Script…") self.group = self.tr("Tools") def execute(self): diff --git a/python/plugins/processing/script/DeleteScriptAction.py b/python/plugins/processing/script/DeleteScriptAction.py index ade87a52a79..96a3fe4f75e 100644 --- a/python/plugins/processing/script/DeleteScriptAction.py +++ b/python/plugins/processing/script/DeleteScriptAction.py @@ -27,6 +27,7 @@ __revision__ = '$Format:%H$' import os +from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtWidgets import QMessageBox from qgis.core import QgsApplication, QgsProcessingAlgorithm @@ -39,7 +40,7 @@ from processing.script import ScriptUtils class DeleteScriptAction(ContextAction): def __init__(self): - self.name = self.tr("Delete Script…") + self.name = QCoreApplication.translate("DeleteScriptAction", "Delete Script…") def isEnabled(self): return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "script" diff --git a/python/plugins/processing/script/EditScriptAction.py b/python/plugins/processing/script/EditScriptAction.py index 7981f0a4af1..593d2c02041 100644 --- a/python/plugins/processing/script/EditScriptAction.py +++ b/python/plugins/processing/script/EditScriptAction.py @@ -29,6 +29,7 @@ import inspect from qgis.core import QgsProcessingAlgorithm from qgis.utils import iface +from qgis.PyQt.QtCore import QCoreApplication from qgis.PyQt.QtWidgets import QMessageBox from processing.gui.ContextAction import ContextAction @@ -40,7 +41,7 @@ from processing.script import ScriptUtils class EditScriptAction(ContextAction): def __init__(self): - self.name = self.tr("Edit Script…") + self.name = QCoreApplication.translate("EditScriptAction", "Edit Script…") def isEnabled(self): return isinstance(self.itemData, QgsProcessingAlgorithm) and self.itemData.provider().id() == "script"