Skip to content

Commit b4f2568

Browse files
alexbruyalexbruy
committed
make parameter descriptions translatable
1 parent a2f686a commit b4f2568

File tree

4 files changed

+104
-96
lines changed

4 files changed

+104
-96
lines changed

‎python/plugins/processing/algs/gdal/ogr2ogrbuffer.py

+27-24
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,34 @@ class Ogr2OgrBuffer(OgrAlgorithm):
4242
OUTPUT_LAYER = 'OUTPUT_LAYER'
4343
INPUT_LAYER = 'INPUT_LAYER'
4444
GEOMETRY = 'GEOMETRY'
45-
DISTANCE = 'DISTANCE'
45+
DISTANCE = 'DISTANCE'
4646
DISSOLVEALL = 'DISSOLVEALL'
4747
FIELD = 'FIELD'
48-
MULTI = 'MULTI'
48+
MULTI = 'MULTI'
4949
OPTIONS = 'OPTIONS'
5050

5151
def defineCharacteristics(self):
5252
self.name = 'Buffer vectors'
5353
self.group = '[OGR] Geoprocessing'
5454

55-
self.addParameter(ParameterVector(self.INPUT_LAYER, 'Input layer',
56-
[ParameterVector.VECTOR_TYPE_ANY], False))
57-
self.addParameter(ParameterString(self.GEOMETRY, 'Geometry column name ("geometry" for Shapefiles, may be different for other formats)',
58-
'geometry', optional=False))
59-
self.addParameter(ParameterString(self.DISTANCE,'Buffer distance', '1000', optional=False))
55+
self.addParameter(ParameterVector(self.INPUT_LAYER,
56+
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_ANY], False))
57+
self.addParameter(ParameterString(self.GEOMETRY,
58+
self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
59+
'geometry', optional=False))
60+
self.addParameter(ParameterString(self.DISTANCE,
61+
self.tr('Buffer distance'), '1000', optional=False))
6062
self.addParameter(ParameterBoolean(self.DISSOLVEALL,
61-
'Dissolve all results?', False))
62-
self.addParameter(ParameterTableField(self.FIELD, 'Dissolve by attribute',
63-
self.INPUT_LAYER, optional=True))
63+
self.tr('Dissolve all results'), False))
64+
self.addParameter(ParameterTableField(self.FIELD,
65+
self.tr('Dissolve by attribute'), self.INPUT_LAYER, optional=True))
6466
self.addParameter(ParameterBoolean(self.MULTI,
65-
'Output as singlepart geometries (only used when dissolving by attribute)?', False))
66-
self.addParameter(ParameterString(self.OPTIONS, 'Additional creation options (see ogr2ogr manual)',
67-
'', optional=True))
68-
self.addOutput(OutputVector(self.OUTPUT_LAYER, 'Output layer'))
67+
self.tr('Output as singlepart geometries (only used when dissolving by attribute)'), False))
68+
self.addParameter(ParameterString(self.OPTIONS,
69+
self.tr('Additional creation options (see ogr2ogr manual)'),
70+
'', optional=True))
71+
72+
self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer')))
6973

7074
def processAlgorithm(self, progress):
7175
inLayer = self.getParameterValue(self.INPUT_LAYER)
@@ -74,9 +78,9 @@ def processAlgorithm(self, progress):
7478
geometry = unicode(self.getParameterValue(self.GEOMETRY))
7579
distance = unicode(self.getParameterValue(self.DISTANCE))
7680
dissolveall = self.getParameterValue(self.DISSOLVEALL)
77-
field = unicode(self.getParameterValue(self.FIELD))
81+
field = unicode(self.getParameterValue(self.FIELD))
7882
multi = self.getParameterValue(self.MULTI)
79-
83+
8084
output = self.getOutputFromName(self.OUTPUT_LAYER)
8185
outFile = output.value
8286

@@ -90,27 +94,27 @@ def processAlgorithm(self, progress):
9094
if dissolveall or field != 'None':
9195
arguments.append('-dialect sqlite -sql "SELECT ST_Union(ST_Buffer(')
9296
else:
93-
arguments.append('-dialect sqlite -sql "SELECT ST_Buffer(')
97+
arguments.append('-dialect sqlite -sql "SELECT ST_Buffer(')
9498
arguments.append(geometry)
9599
arguments.append(',')
96100
arguments.append(distance)
97101
if dissolveall or field != 'None':
98-
arguments.append(')),*')
102+
arguments.append(')),*')
99103
else:
100-
arguments.append('),*')
104+
arguments.append('),*')
101105
arguments.append('FROM')
102106
arguments.append(layername)
103107
if field != 'None':
104108
arguments.append('GROUP')
105-
arguments.append('BY')
106-
arguments.append(field)
107-
arguments.append('"')
109+
arguments.append('BY')
110+
arguments.append(field)
111+
arguments.append('"')
108112
if field != 'None' and multi:
109113
arguments.append('-explodecollections')
110114

111115
if len(options) > 0:
112116
arguments.append(options)
113-
117+
114118
commands = []
115119
if isWindows():
116120
commands = ['cmd.exe', '/C ', 'ogr2ogr.exe',
@@ -119,4 +123,3 @@ def processAlgorithm(self, progress):
119123
commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
120124

121125
GdalUtils.runGdal(commands, progress)
122-

‎python/plugins/processing/algs/gdal/ogr2ogrdissolve.py

+29-30
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ class Ogr2OgrDissolve(OgrAlgorithm):
4242
OUTPUT_LAYER = 'OUTPUT_LAYER'
4343
INPUT_LAYER = 'INPUT_LAYER'
4444
GEOMETRY = 'GEOMETRY'
45-
FIELD = 'FIELD'
46-
MULTI = 'MULTI'
47-
COUNT = 'COUNT'
48-
STATS = 'STATS'
49-
STATSATT = 'STATSATT'
45+
FIELD = 'FIELD'
46+
MULTI = 'MULTI'
47+
COUNT = 'COUNT'
48+
STATS = 'STATS'
49+
STATSATT = 'STATSATT'
5050
AREA = 'AREA'
5151
FIELDS = 'FIELDS'
5252
OPTIONS = 'OPTIONS'
@@ -55,43 +55,43 @@ def defineCharacteristics(self):
5555
self.name = 'Dissolve polygons'
5656
self.group = '[OGR] Geoprocessing'
5757

58-
self.addParameter(ParameterVector(self.INPUT_LAYER, 'Input layer',
59-
[ParameterVector.VECTOR_TYPE_POLYGON], False))
60-
self.addParameter(ParameterString(self.GEOMETRY, 'Geometry column name ("geometry" for Shapefiles, may be different for other formats)',
61-
'geometry', optional=False))
62-
self.addParameter(ParameterTableField(self.FIELD, 'Dissolve field',
63-
self.INPUT_LAYER))
58+
self.addParameter(ParameterVector(self.INPUT_LAYER,
59+
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_POLYGON], False))
60+
self.addParameter(ParameterString(self.GEOMETRY,
61+
self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
62+
'geometry', optional=False))
63+
self.addParameter(ParameterTableField(self.FIELD,
64+
self.tr('Dissolve field'), self.INPUT_LAYER))
6465
self.addParameter(ParameterBoolean(self.MULTI,
65-
'Output as multipart geometries?', True))
66+
self.tr('Output as multipart geometries'), True))
6667
self.addParameter(ParameterBoolean(self.FIELDS,
67-
'Keep input attributes?', False))
68+
self.tr('Keep input attributes'), False))
6869
self.addParameter(ParameterBoolean(self.COUNT,
69-
'Count dissolved features?', False))
70+
self.tr('Count dissolved features'), False))
7071
self.addParameter(ParameterBoolean(self.AREA,
71-
'Compute area and perimeter of dissolved features?', False))
72+
self.tr('Compute area and perimeter of dissolved features'), False))
7273
self.addParameter(ParameterBoolean(self.STATS,
73-
'Compute min/max/sum/mean for the following numeric attribute?', False))
74-
self.addParameter(ParameterTableField(self.STATSATT, 'Numeric attribute to compute dissolved features stats',
75-
self.INPUT_LAYER))
76-
self.addParameter(ParameterString(self.OPTIONS, 'Additional creation options (see ogr2ogr manual)',
77-
'', optional=True))
78-
self.addOutput(OutputVector(self.OUTPUT_LAYER, 'Output layer'))
74+
self.tr('Compute min/max/sum/mean for the following numeric attribute'), False))
75+
self.addParameter(ParameterTableField(self.STATSATT,
76+
self.tr('Numeric attribute to compute dissolved features stats'), self.INPUT_LAYER))
77+
self.addParameter(ParameterString(self.OPTIONS,
78+
self.tr('Additional creation options (see ogr2ogr manual)'),
79+
'', optional=True))
7980

81+
self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer')))
8082

8183
def processAlgorithm(self, progress):
8284
inLayer = self.getParameterValue(self.INPUT_LAYER)
8385
ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
8486
layername = "'" + self.ogrLayerName(inLayer) + "'"
8587
geometry = unicode(self.getParameterValue(self.GEOMETRY))
86-
field = unicode(self.getParameterValue(self.FIELD))
88+
field = unicode(self.getParameterValue(self.FIELD))
8789
statsatt = unicode(self.getParameterValue(self.STATSATT))
8890
stats = self.getParameterValue(self.STATS)
8991
area = self.getParameterValue(self.AREA)
9092
multi = self.getParameterValue(self.MULTI)
9193
count = self.getParameterValue(self.COUNT)
9294
fields = self.getParameterValue(self.FIELDS)
93-
#dsUri = QgsDataSourceURI(self.getParameterValue(self.INPUT_LAYER))
94-
#geomColumn = dsUri.geometryColumn()
9595
querystart = '-dialect sqlite -sql "SELECT ST_Union(' + geometry + ')'
9696
queryend = ' FROM ' + layername + ' GROUP BY ' + field + '"'
9797
if fields:
@@ -109,8 +109,8 @@ def processAlgorithm(self, progress):
109109
if area:
110110
queryarea = ", SUM(ST_area(" + geometry + ")) AS area_diss, ST_perimeter(ST_union(" + geometry + ")) AS peri_diss"
111111
else:
112-
queryarea = ""
113-
112+
queryarea = ""
113+
114114
query = querystart + queryfields + querycount + querystats + queryarea + queryend
115115
output = self.getOutputFromName(self.OUTPUT_LAYER)
116116
outFile = output.value
@@ -122,11 +122,11 @@ def processAlgorithm(self, progress):
122122
arguments.append(output)
123123
arguments.append(ogrLayer)
124124
arguments.append(self.ogrLayerName(inLayer))
125-
arguments.append(query)
125+
arguments.append(query)
126126

127127
if not multi:
128-
arguments.append('-explodecollections')
129-
128+
arguments.append('-explodecollections')
129+
130130
if len(options) > 0:
131131
arguments.append(options)
132132

@@ -138,4 +138,3 @@ def processAlgorithm(self, progress):
138138
commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
139139

140140
GdalUtils.runGdal(commands, progress)
141-

‎python/plugins/processing/algs/gdal/ogr2ogronesidebuffer.py

+32-29
Original file line numberDiff line numberDiff line change
@@ -50,31 +50,35 @@ class Ogr2OgrOneSideBuffer(OgrAlgorithm):
5050
LEFTRIGHTLIST = ['Right','Left']
5151
DISSOLVEALL = 'DISSOLVEALL'
5252
FIELD = 'FIELD'
53-
MULTI = 'MULTI'
53+
MULTI = 'MULTI'
5454
OPTIONS = 'OPTIONS'
5555

5656
def defineCharacteristics(self):
5757
self.name = 'Single sided buffers (and offset lines) for lines'
5858
self.group = '[OGR] Geoprocessing'
5959

60-
self.addParameter(ParameterVector(self.INPUT_LAYER, 'Input layer',
61-
[ParameterVector.VECTOR_TYPE_LINE], False))
62-
self.addParameter(ParameterSelection(self.OPERATION, 'Buffer or Offset Curve?',self.OPERATIONLIST, 0))
63-
self.addParameter(ParameterString(self.GEOMETRY, 'Geometry column name ("geometry" for Shapefiles, may be different for other formats)',
64-
'geometry', optional=False))
65-
self.addParameter(ParameterString(self.RADIUS,'Buffer distance', '1000', optional=False))
66-
self.addParameter(ParameterSelection(self.LEFTRIGHT, 'Left or Right buffer',self.LEFTRIGHTLIST, 0))
60+
self.addParameter(ParameterVector(self.INPUT_LAYER,
61+
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_LINE], False))
62+
self.addParameter(ParameterSelection(self.OPERATION,
63+
self.tr('Operation'),self.OPERATIONLIST, 0))
64+
self.addParameter(ParameterString(self.GEOMETRY,
65+
self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
66+
'geometry', optional=False))
67+
self.addParameter(ParameterString(self.RADIUS,
68+
self.tr('Buffer distance'), '1000', optional=False))
69+
self.addParameter(ParameterSelection(self.LEFTRIGHT,
70+
self.tr('Buffer side'),self.LEFTRIGHTLIST, 0))
6771
self.addParameter(ParameterBoolean(self.DISSOLVEALL,
68-
'Dissolve all results?', False))
69-
self.addParameter(ParameterTableField(self.FIELD, 'Dissolve by attribute',
70-
self.INPUT_LAYER, optional=True))
72+
self.tr('Dissolve all results'), False))
73+
self.addParameter(ParameterTableField(self.FIELD,
74+
self.tr('Dissolve by attribute'), self.INPUT_LAYER, optional=True))
7175
self.addParameter(ParameterBoolean(self.MULTI,
72-
'Output as singlepart geometries (only used when dissolving by attribute)?', False))
73-
self.addParameter(ParameterString(self.OPTIONS, 'Additional creation options (see ogr2ogr manual)',
74-
'', optional=True))
75-
self.addOutput(OutputVector(self.OUTPUT_LAYER, 'Output layer'))
76-
76+
self.tr('Output as singlepart geometries (only used when dissolving by attribute)'), False))
77+
self.addParameter(ParameterString(self.OPTIONS,
78+
self.tr('Additional creation options (see ogr2ogr manual)'),
79+
'', optional=True))
7780

81+
self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer')))
7882

7983
def processAlgorithm(self, progress):
8084
inLayer = self.getParameterValue(self.INPUT_LAYER)
@@ -85,9 +89,9 @@ def processAlgorithm(self, progress):
8589
distance = unicode(self.getParameterValue(self.RADIUS))
8690
leftright = self.LEFTRIGHTLIST[self.getParameterValue(self.LEFTRIGHT)]
8791
dissolveall = self.getParameterValue(self.DISSOLVEALL)
88-
field = unicode(self.getParameterValue(self.FIELD))
92+
field = unicode(self.getParameterValue(self.FIELD))
8993
multi = self.getParameterValue(self.MULTI)
90-
94+
9195
output = self.getOutputFromName(self.OUTPUT_LAYER)
9296
outFile = output.value
9397

@@ -105,35 +109,35 @@ def processAlgorithm(self, progress):
105109
arguments.append('-dialect sqlite -sql "SELECT ST_Union(ST_OffsetCurve(')
106110
else:
107111
if operation == 'Single Side Buffer':
108-
arguments.append('-dialect sqlite -sql "SELECT ST_SingleSidedBuffer(')
112+
arguments.append('-dialect sqlite -sql "SELECT ST_SingleSidedBuffer(')
109113
else:
110-
arguments.append('-dialect sqlite -sql "SELECT ST_OffsetCurve(')
114+
arguments.append('-dialect sqlite -sql "SELECT ST_OffsetCurve(')
111115
arguments.append(geometry)
112116
arguments.append(',')
113117
arguments.append(distance)
114118
if dissolveall or field != 'None':
115119
if leftright == 'Left':
116-
arguments.append(',0)),*')
120+
arguments.append(',0)),*')
117121
else:
118-
arguments.append(',1)),*')
122+
arguments.append(',1)),*')
119123
else:
120124
if leftright == 'Left':
121-
arguments.append(',0),*')
125+
arguments.append(',0),*')
122126
else:
123-
arguments.append(',1),*')
127+
arguments.append(',1),*')
124128
arguments.append('FROM')
125129
arguments.append(layername)
126130
if field != 'None':
127131
arguments.append('GROUP')
128-
arguments.append('BY')
129-
arguments.append(field)
130-
arguments.append('"')
132+
arguments.append('BY')
133+
arguments.append(field)
134+
arguments.append('"')
131135
if field != 'None' and multi:
132136
arguments.append('-explodecollections')
133137

134138
if len(options) > 0:
135139
arguments.append(options)
136-
140+
137141
commands = []
138142
if isWindows():
139143
commands = ['cmd.exe', '/C ', 'ogr2ogr.exe',
@@ -142,4 +146,3 @@ def processAlgorithm(self, progress):
142146
commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
143147

144148
GdalUtils.runGdal(commands, progress)
145-

‎python/plugins/processing/algs/gdal/ogr2ogrpointsonlines.py

+16-13
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,26 @@ def defineCharacteristics(self):
4848
self.name = 'Create points along lines'
4949
self.group = '[OGR] Geoprocessing'
5050

51-
self.addParameter(ParameterVector(self.INPUT_LAYER, 'Input layer',
52-
[ParameterVector.VECTOR_TYPE_LINE], False))
53-
self.addParameter(ParameterString(self.GEOMETRY, 'Geometry column name ("geometry" for Shapefiles, may be different for other formats)',
54-
'geometry', optional=False))
55-
self.addParameter(ParameterNumber(self.DISTANCE, 'Distance from line start represented as fraction of line length', 0, 1, 0.5))
56-
self.addParameter(ParameterString(self.OPTIONS, 'Additional creation options (see ogr2ogr manual)',
57-
'', optional=True))
58-
self.addOutput(OutputVector(self.OUTPUT_LAYER, 'Output layer'))
51+
self.addParameter(ParameterVector(self.INPUT_LAYER,
52+
self.tr('Input layer'), [ParameterVector.VECTOR_TYPE_LINE], False))
53+
self.addParameter(ParameterString(self.GEOMETRY,
54+
self.tr('Geometry column name ("geometry" for Shapefiles, may be different for other formats)'),
55+
'geometry', optional=False))
56+
self.addParameter(ParameterNumber(self.DISTANCE,
57+
self.tr('Distance from line start represented as fraction of line length'), 0, 1, 0.5))
58+
self.addParameter(ParameterString(self.OPTIONS,
59+
self.tr('Additional creation options (see ogr2ogr manual)'),
60+
'', optional=True))
61+
62+
self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Output layer')))
5963

6064
def processAlgorithm(self, progress):
6165
inLayer = self.getParameterValue(self.INPUT_LAYER)
6266
ogrLayer = self.ogrConnectionString(inLayer)[1:-1]
6367
layername = "'" + self.ogrLayerName(inLayer) + "'"
6468
distance = unicode(self.getParameterValue(self.DISTANCE))
6569
geometry = unicode(self.getParameterValue(self.GEOMETRY))
66-
70+
6771
output = self.getOutputFromName(self.OUTPUT_LAYER)
6872
outFile = output.value
6973

@@ -74,7 +78,7 @@ def processAlgorithm(self, progress):
7478
arguments.append(output)
7579
arguments.append(ogrLayer)
7680
arguments.append(self.ogrLayerName(inLayer))
77-
81+
7882
arguments.append('-dialect sqlite -sql "SELECT ST_Line_Interpolate_Point(')
7983
arguments.append(geometry)
8084
arguments.append(',')
@@ -83,10 +87,10 @@ def processAlgorithm(self, progress):
8387
arguments.append('FROM')
8488
arguments.append(layername)
8589
arguments.append('"')
86-
90+
8791
if len(options) > 0:
8892
arguments.append(options)
89-
93+
9094
commands = []
9195
if isWindows():
9296
commands = ['cmd.exe', '/C ', 'ogr2ogr.exe',
@@ -95,4 +99,3 @@ def processAlgorithm(self, progress):
9599
commands = ['ogr2ogr', GdalUtils.escapeAndJoin(arguments)]
96100

97101
GdalUtils.runGdal(commands, progress)
98-

0 commit comments

Comments
 (0)