[processing] fixed wrong call to self.tr from static method

volaya · volaya · commit f661f80bdb30 · 2014-10-07T12:02:30.000+02:00
diff --git a/python/plugins/processing/modeler/ModelerAlgorithm.py b/python/plugins/processing/modeler/ModelerAlgorithm.py
@@ -38,11 +38,9 @@
 from processing.modeler.WrongModelException import WrongModelException
 from processing.core.GeoAlgorithmExecutionException import \
         GeoAlgorithmExecutionException
-from processing.gui.Help2Html import  getHtmlFromHelpFile
 from processing.modeler.ModelerUtils import ModelerUtils
 from processing.core.parameters import *
 from processing.tools import dataobjects
-from processing.core.parameters import getParameterFromString
 from processing.gui.Help2Html import getHtmlFromDescriptionsDict
 
 class ModelerParameter():
@@ -544,6 +542,8 @@ def fromFile(filename):
 
     @staticmethod
     def fromOldFormatFile(filename):
+        def _tr(s):
+            return QtCore.QCoreApplication.translate('ModelerAlgorithm', s)
         hardcodedValues = {}
         modelParameters = []
         modelAlgs = []
@@ -560,7 +560,7 @@ def fromOldFormatFile(filename):
                         pass
                     else:
                         raise WrongModelException(
-                            self.tr('Error in parameter line: %s', 'ModelerAlgorithm') % line)
+                            _tr('Error in parameter line: %s', 'ModelerAlgorithm') % line)
                     line = lines.readline().strip('\n')
                     tokens = line.split(',')
                     model.addParameter(ModelerParameter(param, QtCore.QPointF(
@@ -623,7 +623,7 @@ def fromOldFormatFile(filename):
                         modelAlgs.append(modelAlg.name)
                     else:
                         raise WrongModelException(
-                            self.tr('Error in algorithm name: %s', 'ModelerAlgorithm') % algLine)
+                            _tr('Error in algorithm name: %s', ) % algLine)
                 line = lines.readline().strip('\n').strip('\r')
             for modelAlg in model.algs.values():
                 for name, value in modelAlg.params.iteritems():
@@ -634,4 +634,4 @@ def fromOldFormatFile(filename):
             if isinstance(e, WrongModelException):
                 raise e
             else:
-                raise WrongModelException(self.tr('Error in model definition line: %s\n%s', 'ModelerAlgorithm') % (line.strip(), traceback.format_exc()))
+                raise WrongModelException(_tr('Error in model definition line: ') + '%s\n%s' % (line.strip(), traceback.format_exc()))
