From 3739c3aa51822d1a724ca542ffc2d3e31e530dba Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 4 Apr 2017 11:38:49 +1000
Subject: [PATCH] Move tr out of AlgorithmProvider to subclasses

---
 .../plugins/processing/algs/gdal/GdalAlgorithmProvider.py   | 6 ++++++
 .../processing/algs/grass7/Grass7AlgorithmProvider.py       | 6 ++++++
 python/plugins/processing/algs/r/RAlgorithmProvider.py      | 6 ++++++
 .../plugins/processing/algs/saga/SagaAlgorithmProvider.py   | 6 ++++++
 python/plugins/processing/core/AlgorithmProvider.py         | 6 ------
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
index a840c7a5046..aeb9b92a354 100644
--- a/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
+++ b/python/plugins/processing/algs/gdal/GdalAlgorithmProvider.py
@@ -27,6 +27,7 @@ __revision__ = '$Format:%H$'
 
 import os
 
+from qgis.PyQt.QtCore import QCoreApplication
 from qgis.core import QgsApplication
 from processing.core.AlgorithmProvider import AlgorithmProvider
 from processing.core.ProcessingConfig import ProcessingConfig, Setting
@@ -146,3 +147,8 @@ class GdalAlgorithmProvider(AlgorithmProvider):
 
     def supportedOutputRasterLayerExtensions(self):
         return GdalUtils.getSupportedRasterExtensions()
+
+    def tr(self, string, context=''):
+        if context == '':
+            context = 'GdalAlgorithmProvider'
+        return QCoreApplication.translate(context, string)
diff --git a/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py b/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
index 8b85293c10c..aeea729775e 100644
--- a/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
+++ b/python/plugins/processing/algs/grass7/Grass7AlgorithmProvider.py
@@ -27,6 +27,7 @@ __copyright__ = '(C) 2014, Victor Olaya'
 __revision__ = '$Format:%H$'
 
 import os
+from qgis.PyQt.QtCore import QCoreApplication
 from qgis.core import QgsApplication
 from processing.core.ProcessingConfig import ProcessingConfig, Setting
 from processing.core.AlgorithmProvider import AlgorithmProvider
@@ -119,3 +120,8 @@ class Grass7AlgorithmProvider(AlgorithmProvider):
 
     def canBeActivated(self):
         return not bool(Grass7Utils.checkGrass7IsInstalled())
+
+    def tr(self, string, context=''):
+        if context == '':
+            context = 'Grass7AlgorithmProvider'
+        return QCoreApplication.translate(context, string)
diff --git a/python/plugins/processing/algs/r/RAlgorithmProvider.py b/python/plugins/processing/algs/r/RAlgorithmProvider.py
index e1cfe6a4a5d..fd06257a062 100644
--- a/python/plugins/processing/algs/r/RAlgorithmProvider.py
+++ b/python/plugins/processing/algs/r/RAlgorithmProvider.py
@@ -28,6 +28,7 @@ __revision__ = '$Format:%H$'
 
 import os
 
+from qgis.PyQt.QtCore import QCoreApplication
 from qgis.core import QgsApplication
 from processing.core.ProcessingConfig import ProcessingConfig, Setting
 from processing.core.ProcessingLog import ProcessingLog
@@ -128,3 +129,8 @@ class RAlgorithmProvider(AlgorithmProvider):
                             ProcessingLog.LOG_ERROR,
                             self.tr('Could not load R script: {0}\n{1}').format(descriptionFile, str(e)))
         return
+
+    def tr(self, string, context=''):
+        if context == '':
+            context = 'RAlgorithmProvider'
+        return QCoreApplication.translate(context, string)
diff --git a/python/plugins/processing/algs/saga/SagaAlgorithmProvider.py b/python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
index 16c3abc822a..3375ab27c7a 100644
--- a/python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
+++ b/python/plugins/processing/algs/saga/SagaAlgorithmProvider.py
@@ -28,6 +28,7 @@ __revision__ = '$Format:%H$'
 
 import os
 from qgis.PyQt.QtGui import QIcon
+from qgis.PyQt.QtCore import QCoreApplication
 from processing.core.AlgorithmProvider import AlgorithmProvider
 from processing.core.ProcessingConfig import ProcessingConfig, Setting
 from processing.core.ProcessingLog import ProcessingLog
@@ -123,3 +124,8 @@ class SagaAlgorithmProvider(AlgorithmProvider):
 
     def icon(self):
         return QIcon(os.path.join(pluginPath, 'images', 'saga.png'))
+
+    def tr(self, string, context=''):
+        if context == '':
+            context = 'SagaAlgorithmProvider'
+        return QCoreApplication.translate(context, string)
diff --git a/python/plugins/processing/core/AlgorithmProvider.py b/python/plugins/processing/core/AlgorithmProvider.py
index 12a40b33b1e..4f28b794574 100644
--- a/python/plugins/processing/core/AlgorithmProvider.py
+++ b/python/plugins/processing/core/AlgorithmProvider.py
@@ -25,7 +25,6 @@ __copyright__ = '(C) 2012, Victor Olaya'
 
 __revision__ = '$Format:%H$'
 
-from qgis.PyQt.QtCore import QCoreApplication
 from qgis.core import (QgsProcessingProvider)
 from processing.core.ProcessingConfig import Setting, ProcessingConfig
 
@@ -72,8 +71,3 @@ class AlgorithmProvider(QgsProcessingProvider):
         """
         name = 'ACTIVATE_' + self.id().upper().replace(' ', '_')
         ProcessingConfig.removeSetting(name)
-
-    def tr(self, string, context=''):
-        if context == '':
-            context = self.__class__.__name__
-        return QCoreApplication.translate(context, string)