Skip to content

Commit 5f10b70

Browse files
alexbruyalexbruy
committed
Merge pull request #2283 from arnaud-morvan/processing-translate-parameterselection-content
[processing] include ParameterSelection dropdown contents in translations
2 parents a77e3bf + ea0dc6e commit 5f10b70

23 files changed

+140
-95
lines changed

‎python/plugins/processing/algs/qgis/AddTableField.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,22 @@ class AddTableField(GeoAlgorithm):
4545
FIELD_LENGTH = 'FIELD_LENGTH'
4646
FIELD_PRECISION = 'FIELD_PRECISION'
4747

48-
TYPE_NAMES = ['Integer', 'Float', 'String']
4948
TYPES = [QVariant.Int, QVariant.Double, QVariant.String]
5049

5150
def defineCharacteristics(self):
5251
self.name, self.i18n_name = self.trAlgorithm('Add field to attributes table')
5352
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
5453

54+
self.type_names = [self.tr('Integer'),
55+
self.tr('Float'),
56+
self.tr('String')]
57+
5558
self.addParameter(ParameterVector(self.INPUT_LAYER,
5659
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
5760
self.addParameter(ParameterString(self.FIELD_NAME,
5861
self.tr('Field name')))
5962
self.addParameter(ParameterSelection(self.FIELD_TYPE,
60-
self.tr('Field type'), self.TYPE_NAMES))
63+
self.tr('Field type'), self.type_names))
6164
self.addParameter(ParameterNumber(self.FIELD_LENGTH,
6265
self.tr('Field length'), 1, 255, 10))
6366
self.addParameter(ParameterNumber(self.FIELD_PRECISION,

‎python/plugins/processing/algs/qgis/CheckValidity.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ class CheckValidity(GeoAlgorithm):
4444
INVALID_OUTPUT = 'INVALID_OUTPUT'
4545
ERROR_OUTPUT = 'ERROR_OUTPUT'
4646

47-
METHODS = ['The one selected in digitizing settings',
48-
'QGIS',
49-
'GEOS']
50-
5147
def defineCharacteristics(self):
5248
self.name, self.i18n_name = self.trAlgorithm('Check validity')
5349
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
5450

51+
self.methods = [self.tr('The one selected in digitizing settings'),
52+
'QGIS',
53+
'GEOS']
54+
5555
self.addParameter(ParameterVector(
5656
self.INPUT_LAYER,
5757
self.tr('Input layer'),
@@ -60,7 +60,7 @@ def defineCharacteristics(self):
6060
self.addParameter(ParameterSelection(
6161
self.METHOD,
6262
self.tr('Method'),
63-
self.METHODS))
63+
self.methods))
6464

6565
self.addOutput(OutputVector(
6666
self.VALID_OUTPUT,

‎python/plugins/processing/algs/qgis/ConvexHull.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,21 @@ class ConvexHull(GeoAlgorithm):
4343
OUTPUT = 'OUTPUT'
4444
FIELD = 'FIELD'
4545
METHOD = 'METHOD'
46-
METHODS = ['Create single minimum convex hull',
47-
'Create convex hulls based on field']
4846

4947
def defineCharacteristics(self):
5048
self.name, self.i18n_name = self.trAlgorithm('Convex hull')
5149
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
50+
51+
self.methods = [self.tr('Create single minimum convex hull'),
52+
self.tr('Create convex hulls based on field')]
53+
5254
self.addParameter(ParameterVector(self.INPUT,
5355
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5456
self.addParameter(ParameterTableField(self.FIELD,
5557
self.tr('Field (optional, only used if creating convex hulls by classes)'),
5658
self.INPUT, optional=True))
5759
self.addParameter(ParameterSelection(self.METHOD,
58-
self.tr('Method'), self.METHODS))
60+
self.tr('Method'), self.methods))
5961
self.addOutput(OutputVector(self.OUTPUT, self.tr('Convex hull')))
6062

6163
def processAlgorithm(self, progress):

‎python/plugins/processing/algs/qgis/Eliminate.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,18 @@ class Eliminate(GeoAlgorithm):
4949
COMPARISONVALUE = 'COMPARISONVALUE'
5050
COMPARISON = 'COMPARISON'
5151

52-
MODES = ['Largest area', 'Smallest Area', 'Largest common boundary']
5352
MODE_LARGEST_AREA = 0
5453
MODE_SMALLEST_AREA = 1
5554
MODE_BOUNDARY = 2
5655

5756
def defineCharacteristics(self):
5857
self.name, self.i18n_name = self.trAlgorithm('Eliminate sliver polygons')
5958
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
59+
60+
self.modes = [self.tr('Largest area'),
61+
self.tr('Smallest Area'),
62+
self.tr('Largest common boundary')]
63+
6064
self.addParameter(ParameterVector(self.INPUT,
6165
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POLYGON]))
6266
self.addParameter(ParameterBoolean(self.KEEPSELECTION,
@@ -79,7 +83,7 @@ def defineCharacteristics(self):
7983
self.tr('Value'), default='0'))
8084
self.addParameter(ParameterSelection(self.MODE,
8185
self.tr('Merge selection with the neighbouring polygon with the'),
82-
self.MODES))
86+
self.modes))
8387
self.addOutput(OutputVector(self.OUTPUT, self.tr('Cleaned')))
8488

8589
def processAlgorithm(self, progress):

‎python/plugins/processing/algs/qgis/ExportGeometryInfo.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,18 @@ class ExportGeometryInfo(GeoAlgorithm):
4141
METHOD = 'CALC_METHOD'
4242
OUTPUT = 'OUTPUT'
4343

44-
CALC_METHODS = ['Layer CRS', 'Project CRS', 'Ellipsoidal']
45-
4644
def defineCharacteristics(self):
4745
self.name, self.i18n_name = self.trAlgorithm('Export/Add geometry columns')
4846
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
4947

48+
self.calc_methods = [self.tr('Layer CRS'),
49+
self.tr('Project CRS'),
50+
self.tr('Ellipsoidal')]
51+
5052
self.addParameter(ParameterVector(self.INPUT,
5153
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5254
self.addParameter(ParameterSelection(self.METHOD,
53-
self.tr('Calculate using'), self.CALC_METHODS, 0))
55+
self.tr('Calculate using'), self.calc_methods, 0))
5456

5557
self.addOutput(OutputVector(self.OUTPUT, self.tr('Added geom info')))
5658

‎python/plugins/processing/algs/qgis/ExtractByAttribute.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,21 @@ def defineCharacteristics(self):
5858
self.name, self.i18n_name = self.trAlgorithm('Extract by attribute')
5959
self.group, self.i18n_group = self.trAlgorithm('Vector selection tools')
6060

61+
self.i18n_operators = ['=',
62+
'!=',
63+
'>',
64+
'>=',
65+
'<',
66+
'<=',
67+
self.tr('begins with'),
68+
self.tr('contains')]
69+
6170
self.addParameter(ParameterVector(self.INPUT,
6271
self.tr('Input Layer'), [ParameterVector.VECTOR_TYPE_ANY]))
6372
self.addParameter(ParameterTableField(self.FIELD,
6473
self.tr('Selection attribute'), self.INPUT))
6574
self.addParameter(ParameterSelection(self.OPERATOR,
66-
self.tr('Operator'), self.OPERATORS))
75+
self.tr('Operator'), self.i18n_operators))
6776
self.addParameter(ParameterString(self.VALUE, self.tr('Value')))
6877

6978
self.addOutput(OutputVector(self.OUTPUT, self.tr('Extracted (attribute)')))

‎python/plugins/processing/algs/qgis/FieldPyculator.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,22 @@ class FieldsPyculator(GeoAlgorithm):
5151
OUTPUT_LAYER = 'OUTPUT_LAYER'
5252
RESULT_VAR_NAME = 'value'
5353

54-
TYPE_NAMES = ['Integer', 'Float', 'String']
5554
TYPES = [QVariant.Int, QVariant.Double, QVariant.String]
5655

5756
def defineCharacteristics(self):
5857
self.name, self.i18n_name = self.trAlgorithm('Advanced Python field calculator')
5958
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
59+
60+
self.type_names = [self.tr('Integer'),
61+
self.tr('Float'),
62+
self.tr('String')]
63+
6064
self.addParameter(ParameterVector(self.INPUT_LAYER,
6165
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
6266
self.addParameter(ParameterString(self.FIELD_NAME,
6367
self.tr('Result field name'), 'NewField'))
6468
self.addParameter(ParameterSelection(self.FIELD_TYPE,
65-
self.tr('Field type'), self.TYPE_NAMES))
69+
self.tr('Field type'), self.type_names))
6670
self.addParameter(ParameterNumber(self.FIELD_LENGTH,
6771
self.tr('Field length'), 1, 255, 10))
6872
self.addParameter(ParameterNumber(self.FIELD_PRECISION,

‎python/plugins/processing/algs/qgis/FieldsCalculator.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,23 @@ class FieldsCalculator(GeoAlgorithm):
5252
FORMULA = 'FORMULA'
5353
OUTPUT_LAYER = 'OUTPUT_LAYER'
5454

55-
TYPE_NAMES = ['Float', 'Integer', 'String', 'Date']
5655
TYPES = [QVariant.Double, QVariant.Int, QVariant.String, QVariant.Date]
5756

5857
def defineCharacteristics(self):
5958
self.name, self.i18n_name = self.trAlgorithm('Field calculator')
6059
self.group, self.i18n_group = self.trAlgorithm('Vector table tools')
60+
61+
self.type_names = [self.tr('Float'),
62+
self.tr('Integer'),
63+
self.tr('String'),
64+
self.tr('Date')]
65+
6166
self.addParameter(ParameterVector(self.INPUT_LAYER,
6267
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
6368
self.addParameter(ParameterString(self.FIELD_NAME,
6469
self.tr('Result field name')))
6570
self.addParameter(ParameterSelection(self.FIELD_TYPE,
66-
self.tr('Field type'), self.TYPE_NAMES))
71+
self.tr('Field type'), self.type_names))
6772
self.addParameter(ParameterNumber(self.FIELD_LENGTH,
6873
self.tr('Field length'), 1, 255, 10))
6974
self.addParameter(ParameterNumber(self.FIELD_PRECISION,

‎python/plugins/processing/algs/qgis/GeometryConvert.py‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,20 @@ class GeometryConvert(GeoAlgorithm):
4040
TYPE = 'TYPE'
4141
OUTPUT = 'OUTPUT'
4242

43-
TYPES = ['Centroids',
44-
'Nodes',
45-
'Linestrings',
46-
'Multilinestrings',
47-
'Polygons'
48-
]
49-
5043
def defineCharacteristics(self):
5144
self.name, self.i18n_name = self.trAlgorithm('Convert geometry type')
5245
self.group, self.i18n_group = self.trAlgorithm('Vector geometry tools')
5346

47+
self.types = [self.tr('Centroids'),
48+
self.tr('Nodes'),
49+
self.tr('Linestrings'),
50+
self.tr('Multilinestrings'),
51+
self.tr('Polygons')]
52+
5453
self.addParameter(ParameterVector(self.INPUT,
5554
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY]))
5655
self.addParameter(ParameterSelection(self.TYPE,
57-
self.tr('New geometry type'), self.TYPES))
56+
self.tr('New geometry type'), self.types))
5857

5958
self.addOutput(OutputVector(self.OUTPUT, self.tr('Converted')))
6059

‎python/plugins/processing/algs/qgis/Grid.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,17 @@ class Grid(GeoAlgorithm):
4646
CRS = 'CRS'
4747
OUTPUT = 'OUTPUT'
4848

49-
TYPES = ['Rectangle (line)',
50-
'Rectangle (polygon)',
51-
'Diamond (polygon)',
52-
'Hexagon (polygon)'
53-
]
54-
5549
def defineCharacteristics(self):
5650
self.name, self.i18n_name = self.trAlgorithm('Create grid')
5751
self.group, self.i18n_group = self.trAlgorithm('Vector creation tools')
5852

53+
self.types = [self.tr('Rectangle (line)'),
54+
self.tr('Rectangle (polygon)'),
55+
self.tr('Diamond (polygon)'),
56+
self.tr('Hexagon (polygon)')]
57+
5958
self.addParameter(ParameterSelection(self.TYPE,
60-
self.tr('Grid type'), self.TYPES))
59+
self.tr('Grid type'), self.types))
6160
self.addParameter(ParameterExtent(self.EXTENT,
6261
self.tr('Grid extent')))
6362
self.addParameter(ParameterNumber(self.HSPACING,

0 commit comments

Comments
 (0)