diff --git a/python/plugins/processing/gui/ProcessingToolbox.py b/python/plugins/processing/gui/ProcessingToolbox.py index e6c8be72727..0047accb1be 100755 --- a/python/plugins/processing/gui/ProcessingToolbox.py +++ b/python/plugins/processing/gui/ProcessingToolbox.py @@ -180,7 +180,7 @@ class ProcessingToolbox(QgsDockWidget, WIDGET): menu = QMenu(provider.name(), self) for action in actions: action.setData(self) - act = QAction(action.i18n_name, menu) + act = QAction(action.name, menu) act.triggered.connect(action.execute) menu.addAction(act) toolbarButton.setMenu(menu) diff --git a/python/plugins/processing/gui/ToolboxAction.py b/python/plugins/processing/gui/ToolboxAction.py index 60e2402d858..d475bbee39f 100644 --- a/python/plugins/processing/gui/ToolboxAction.py +++ b/python/plugins/processing/gui/ToolboxAction.py @@ -42,8 +42,3 @@ class ToolboxAction: if context == '': context = self.__class__.__name__ return QCoreApplication.translate(context, string) - - def trAction(self, string, context=''): - if context == '': - context = self.__class__.__name__ - return string, QCoreApplication.translate(context, string) diff --git a/python/plugins/processing/modeler/AddModelFromFileAction.py b/python/plugins/processing/modeler/AddModelFromFileAction.py index 49a61d16d8e..3b21ea3ef2d 100644 --- a/python/plugins/processing/modeler/AddModelFromFileAction.py +++ b/python/plugins/processing/modeler/AddModelFromFileAction.py @@ -42,8 +42,8 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0] class AddModelFromFileAction(ToolboxAction): def __init__(self): - self.name, self.i18n_name = self.trAction('Add model from file') - self.group, self.i18n_group = self.trAction('Tools') + self.name = self.tr('Add model from file') + self.group = self.tr('Tools') def getIcon(self): return QgsApplication.getThemeIcon("/processingModel.svg") diff --git a/python/plugins/processing/modeler/CreateNewModelAction.py b/python/plugins/processing/modeler/CreateNewModelAction.py index 8e5ac3834bd..dc6a0ea695f 100644 --- a/python/plugins/processing/modeler/CreateNewModelAction.py +++ b/python/plugins/processing/modeler/CreateNewModelAction.py @@ -38,8 +38,8 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0] class CreateNewModelAction(ToolboxAction): def __init__(self): - self.name, self.i18n_name = self.trAction('Create new model') - self.group, self.i18n_group = self.trAction('Tools') + self.name = self.tr('Create new model') + self.group = self.tr('Tools') def getIcon(self): return QgsApplication.getThemeIcon("/processingModel.svg") diff --git a/python/plugins/processing/modeler/ModelerDialog.py b/python/plugins/processing/modeler/ModelerDialog.py index 340d93b37cc..df893b3d611 100644 --- a/python/plugins/processing/modeler/ModelerDialog.py +++ b/python/plugins/processing/modeler/ModelerDialog.py @@ -805,7 +805,7 @@ class TreeActionItem(QTreeWidgetItem): def __init__(self, action): QTreeWidgetItem.__init__(self) self.action = action - self.setText(0, action.i18n_name) + self.setText(0, action.name) self.setIcon(0, action.getIcon()) self.setData(0, ModelerDialog.NAME_ROLE, action.name) diff --git a/python/plugins/processing/script/AddScriptFromFileAction.py b/python/plugins/processing/script/AddScriptFromFileAction.py index 011cf054925..e612a87d4fc 100644 --- a/python/plugins/processing/script/AddScriptFromFileAction.py +++ b/python/plugins/processing/script/AddScriptFromFileAction.py @@ -44,8 +44,8 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0] class AddScriptFromFileAction(ToolboxAction): def __init__(self): - self.name, self.i18n_name = self.trAction('Add script from file') - self.group, self.i18n_group = self.trAction('Tools') + self.name = self.tr('Add script from file') + self.group = self.tr('Tools') def getIcon(self): return QgsApplication.getThemeIcon("/processingScript.svg") diff --git a/python/plugins/processing/script/CreateNewScriptAction.py b/python/plugins/processing/script/CreateNewScriptAction.py index b438efe4768..07d94c1de86 100644 --- a/python/plugins/processing/script/CreateNewScriptAction.py +++ b/python/plugins/processing/script/CreateNewScriptAction.py @@ -37,9 +37,10 @@ pluginPath = os.path.split(os.path.dirname(__file__))[0] class CreateNewScriptAction(ToolboxAction): - def __init__(self, actionName): - self.name, self.i18n_name = self.trAction(actionName) - self.group, self.i18n_group = self.trAction('Tools') + + def __init__(self): + self.name = self.tr('Create new script') + self.group = self.tr('Tools') def getIcon(self): return QgsApplication.getThemeIcon("/processingScript.svg") diff --git a/python/plugins/processing/script/CreateScriptCollectionPluginAction.py b/python/plugins/processing/script/CreateScriptCollectionPluginAction.py index 8e515cd5191..94d8847a76c 100644 --- a/python/plugins/processing/script/CreateScriptCollectionPluginAction.py +++ b/python/plugins/processing/script/CreateScriptCollectionPluginAction.py @@ -75,8 +75,8 @@ class ProcessingScriptCollectionPlugin: class CreateScriptCollectionPluginAction(ToolboxAction): def __init__(self): - self.name, self.i18n_name = self.trAction("Create script collection plugin") - self.group, self.i18n_group = self.trAction("Tools") + self.name = self.tr("Create script collection plugin") + self.group = self.tr("Tools") def getIcon(self): return QgsApplication.getThemeIcon("/processingScript.svg") diff --git a/python/plugins/processing/script/ScriptAlgorithmProvider.py b/python/plugins/processing/script/ScriptAlgorithmProvider.py index 3496bbf49d8..33e05cd1986 100644 --- a/python/plugins/processing/script/ScriptAlgorithmProvider.py +++ b/python/plugins/processing/script/ScriptAlgorithmProvider.py @@ -50,7 +50,7 @@ class ScriptAlgorithmProvider(QgsProcessingProvider): super().__init__() self.algs = [] self.folder_algorithms = [] - self.actions = [CreateNewScriptAction('Create new script'), + self.actions = [CreateNewScriptAction(), AddScriptFromFileAction(), CreateScriptCollectionPluginAction()] self.contextMenuActions = [EditScriptAction(),