sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
volaya 2014-10-07 11:58:17 +02:00
parent cc8058a9d4
commit f661f80bdb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/plugins/processing/modeler/ModelerAlgorithm.py
View File

@ -38,11 +38,9 @@ from processing.core.GeoAlgorithm import GeoAlgorithm
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 @@ class ModelerAlgorithm(GeoAlgorithm):
@staticmethod
def fromOldFormatFile(filename):
def _tr(s):
return QtCore.QCoreApplication.translate('ModelerAlgorithm', s)
hardcodedValues = {}
modelParameters = []
modelAlgs = []
@ -560,7 +560,7 @@ class ModelerAlgorithm(GeoAlgorithm):
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 @@ class ModelerAlgorithm(GeoAlgorithm):
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 @@ class ModelerAlgorithm(GeoAlgorithm):
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()))