Skip to content

Commit d25ef91

Browse files
author
gsherman
committed
Internationalization fixes
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6937 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8ae7de1 commit d25ef91

11 files changed

+214
-213
lines changed

‎src/plugins/grass/modules/v.out.ogr.shape.qgm

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
<qgisgrassmodule label="Export vector layer to Shapefile" module="v.out.ogr">
55
<option key="input" layeroption="layer" typeoption="type" />
66
<option key="format" answer="ESRI_Shapefile" hidden="yes" />
7+
<flag key="c" answer="on" hidden="no />
78
<file key="dsn" type="new" fileoption="olayer" label="Output Shapefile" filters="Shapefile (*.shp)" />
89
</qgisgrassmodule>

‎src/plugins/grass/qgsgrassattributes.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,13 @@ int QgsGrassAttributes::addTab ( const QString & label )
162162
tb->setRowReadOnly ( 0, TRUE );
163163
tb->setRowReadOnly ( 1, TRUE );
164164

165-
tb->horizontalHeader()->setLabel( 0, "Column" );
166-
tb->horizontalHeader()->setLabel( 1, "Value" );
167-
tb->horizontalHeader()->setLabel( 2, "Type" ); // Internal use
165+
tb->horizontalHeader()->setLabel( 0, tr("Column") );
166+
tb->horizontalHeader()->setLabel( 1, tr("Value") );
167+
tb->horizontalHeader()->setLabel( 2, tr("Type") ); // Internal use
168168

169169
tb->setLeftMargin(0); // hide row labels
170170

171-
tb->setText ( 0, 0, "Field" );
171+
tb->setText ( 0, 0, tr("Field") );
172172
tb->setText ( 1, 0, "Cat" );
173173

174174
tabCats->addTab ( tb, label );
@@ -310,9 +310,9 @@ void QgsGrassAttributes::updateAttributes ( )
310310

311311
if ( !error->isEmpty() ) {
312312
QMessageBox::warning( 0, tr("Warning"), *error );
313-
resultLabel->setText ( "ERROR" );
313+
resultLabel->setText ( tr("ERROR") );
314314
} else {
315-
resultLabel->setText ( "OK" );
315+
resultLabel->setText ( tr("OK") );
316316
}
317317

318318
delete error;

‎src/plugins/grass/qgsgrassbrowser.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,8 @@ void QgsGrassBrowser::copyMap()
270270
{
271271
suggest = map;
272272
}
273-
QString newName = ed.getItem ( element, "New name",
274-
"New name", suggest, source, &ok );
273+
QString newName = ed.getItem ( element, tr("New name"),
274+
tr("New name"), suggest, source, &ok );
275275

276276
if ( !ok ) return;
277277

@@ -336,8 +336,8 @@ void QgsGrassBrowser::renameMap()
336336

337337
QgsGrassElementDialog ed;
338338
bool ok;
339-
QString newName = ed.getItem ( element, "New name",
340-
"New name", "", map, &ok );
339+
QString newName = ed.getItem ( element, tr("New name"),
340+
tr("New name"), "", map, &ok );
341341

342342
if ( !ok ) return;
343343

‎src/plugins/grass/qgsgrassmapcalc.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ QgsGrassMapcalc::QgsGrassMapcalc (
239239
// Add output object
240240
mOutput = new QgsGrassMapcalcObject( QgsGrassMapcalcObject::Output);
241241
mOutput->setId ( nextId() );
242-
mOutput->setValue ( "Output" );
242+
mOutput->setValue ( tr("Output") );
243243
mOutput->setCanvas(mCanvas);
244244
mOutput->setCenter ( (int)(mCanvas->width()-mOutput->width()), (int)(mCanvas->height()/2) ),
245245
mCanvas->update();
@@ -1385,7 +1385,7 @@ void QgsGrassMapcalc::load()
13851385
}
13861386

13871387
case QgsGrassMapcalcObject::Output :
1388-
obj->setValue ( "Output" );
1388+
obj->setValue ( tr("Output") );
13891389
mOutput = obj;
13901390
break;
13911391

‎src/plugins/grass/qgsgrassmodel.cpp

+44-44
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,19 @@ QString QgsGrassModelItem::info()
130130
switch ( mType )
131131
{
132132
case QgsGrassModel::Location:
133-
return "Location: " + mLocation;
133+
return QObject::tr("Location: ","Metadata in GRASS Browser") + mLocation;
134134
break;
135135
case QgsGrassModel::Mapset:
136-
return "Location: " + mLocation + "<br>Mapset: " + mMapset;
136+
return QObject::tr("Location: ","Metadata in GRASS Browser") + mLocation + QObject::tr("<br>Mapset: ","Metadata in GRASS Browser") + mMapset;
137137
break;
138138
case QgsGrassModel::Vectors:
139139
case QgsGrassModel::Rasters:
140-
return "Location: " + mLocation + "<br>Mapset: " + mMapset;
140+
return QObject::tr("Location: ") + mLocation + QObject::tr("<br>Mapset: ") + mMapset;
141141
break;
142142
case QgsGrassModel::Raster:
143143
{
144144
QString str = tblStart;
145-
str += htmlTableRow("<b>Raster</b>", "<b>" + mMap + "</b>" );
145+
str += htmlTableRow(QObject::tr("<b>Raster</b>"), "<b>" + mMap + "</b>" );
146146

147147
struct Cell_head head;
148148
int rasterType = -1;
@@ -151,18 +151,18 @@ QString QgsGrassModelItem::info()
151151
if( G_get_cellhd( mMap.toLocal8Bit().data(),
152152
mMapset.toLocal8Bit().data(), &head) != 0 )
153153
{
154-
str += "<tr><td colspan=2>Cannot open raster header</td></tr>";
154+
str += "<tr><td colspan=2>" + QObject::tr("Cannot open raster header") + "</td></tr>";
155155
}
156156
else
157157
{
158-
str += htmlTableRow ( "Rows", QString::number(head.rows));
159-
str += htmlTableRow ( "Columns", QString::number(head.cols) );
160-
str += htmlTableRow ( "N-S resolution", QString::number(head.ns_res) );
161-
str += htmlTableRow ( "E-W resolution", QString::number(head.ew_res) );
162-
str += htmlTableRow ( "North", QString::number(head.north) );
163-
str += htmlTableRow ( "South", QString::number(head.south) );
164-
str += htmlTableRow ( "East", QString::number(head.east) );
165-
str += htmlTableRow ( "West", QString::number(head.west) );
158+
str += htmlTableRow ( QObject::tr("Rows"), QString::number(head.rows));
159+
str += htmlTableRow ( QObject::tr("Columns"), QString::number(head.cols) );
160+
str += htmlTableRow ( QObject::tr("N-S resolution"), QString::number(head.ns_res) );
161+
str += htmlTableRow ( QObject::tr("E-W resolution"), QString::number(head.ew_res) );
162+
str += htmlTableRow ( QObject::tr("North"), QString::number(head.north) );
163+
str += htmlTableRow ( QObject::tr("South"), QString::number(head.south) );
164+
str += htmlTableRow ( QObject::tr("East"), QString::number(head.east) );
165+
str += htmlTableRow ( QObject::tr("West"), QString::number(head.west) );
166166

167167
rasterType = G_raster_map_type( mMap.toLocal8Bit().data(),
168168
mMapset.toLocal8Bit().data() );
@@ -185,7 +185,7 @@ QString QgsGrassModelItem::info()
185185
{
186186
format += "unknown";
187187
}
188-
str += htmlTableRow ( "Format", format );
188+
str += htmlTableRow ( QObject::tr("Format"), format );
189189
}
190190

191191
// Range of values
@@ -196,8 +196,8 @@ QString QgsGrassModelItem::info()
196196
double min, max;
197197
G_get_fp_range_min_max( &range, &min, &max );
198198

199-
str += htmlTableRow ( "Minimum value", QString::number(min));
200-
str += htmlTableRow ( "Maximum value", QString::number(max));
199+
str += htmlTableRow ( QObject::tr("Minimum value"), QString::number(min));
200+
str += htmlTableRow ( QObject::tr("Maximum value"), QString::number(max));
201201
}
202202

203203
// History
@@ -208,12 +208,12 @@ QString QgsGrassModelItem::info()
208208
if ( QString(hist.datsrc_1).length() > 0
209209
|| QString(hist.datsrc_2).length() > 0 )
210210
{
211-
str += htmlTableRow ( "Data source", QString(hist.datsrc_1) + " "
211+
str += htmlTableRow ( QObject::tr("Data source"), QString(hist.datsrc_1) + " "
212212
+ QString(hist.datsrc_2) );
213213
}
214214
if ( QString(hist.keywrd).length() > 0 )
215215
{
216-
str += htmlTableRow ( "Data description", QString(hist.keywrd) );
216+
str += htmlTableRow ( QObject::tr("Data description"), QString(hist.keywrd) );
217217
}
218218
if ( hist.edlinecnt > 0 )
219219
{
@@ -222,7 +222,7 @@ QString QgsGrassModelItem::info()
222222
{
223223
h += QString(hist.edhist[i]) + "<br>";
224224
}
225-
str += htmlTableRow ( "Comments", h);
225+
str += htmlTableRow ( QObject::tr("Comments"), h);
226226
}
227227
}
228228

@@ -237,7 +237,7 @@ QString QgsGrassModelItem::info()
237237
{
238238
if ( Cats.ncats > 0 )
239239
{
240-
str += "<tr><td colspan=2>Categories</td></tr>";
240+
str += "<tr><td colspan=2>" + QObject::tr("Categories") + "</td></tr>";
241241
for ( int i = 0; i < Cats.ncats; i++)
242242
{
243243
str += htmlTableRow (
@@ -257,7 +257,7 @@ QString QgsGrassModelItem::info()
257257
case QgsGrassModel::Vector:
258258
{
259259
QString str = tblStart;
260-
str += htmlTableRow("<b>Vector</b>", "<b>" + mMap + "</b>" );
260+
str += htmlTableRow(QObject::tr("<b>Vector</b>"), "<b>" + mMap + "</b>" );
261261

262262
QgsGrass::setLocation( mGisbase, mLocation );
263263

@@ -270,18 +270,18 @@ QString QgsGrassModelItem::info()
270270
int is3d = Vect_is_3d (&Map);
271271

272272
// Number of elements
273-
str += htmlTableRow ( "Points", QString::number(Vect_get_num_primitives(&Map, GV_POINT)) );
274-
str += htmlTableRow ( "Lines", QString::number(Vect_get_num_primitives(&Map, GV_LINE)) );
275-
str += htmlTableRow ( "Boundaries", QString::number(Vect_get_num_primitives(&Map, GV_BOUNDARY)) );
276-
str += htmlTableRow ( "Centroids", QString::number(Vect_get_num_primitives(&Map, GV_CENTROID)) );
273+
str += htmlTableRow ( QObject::tr("Points"), QString::number(Vect_get_num_primitives(&Map, GV_POINT)) );
274+
str += htmlTableRow ( QObject::tr("Lines"), QString::number(Vect_get_num_primitives(&Map, GV_LINE)) );
275+
str += htmlTableRow ( QObject::tr("Boundaries"), QString::number(Vect_get_num_primitives(&Map, GV_BOUNDARY)) );
276+
str += htmlTableRow ( QObject::tr("Centroids"), QString::number(Vect_get_num_primitives(&Map, GV_CENTROID)) );
277277
if ( is3d )
278278
{
279-
str += htmlTableRow ( "Faces", QString::number( Vect_get_num_primitives(&Map, GV_FACE) ) );
280-
str += htmlTableRow ( "Kernels", QString::number( Vect_get_num_primitives(&Map, GV_KERNEL) ) );
279+
str += htmlTableRow ( QObject::tr("Faces"), QString::number( Vect_get_num_primitives(&Map, GV_FACE) ) );
280+
str += htmlTableRow ( QObject::tr("Kernels"), QString::number( Vect_get_num_primitives(&Map, GV_KERNEL) ) );
281281
}
282282

283-
str += htmlTableRow ( "Areas", QString::number(Vect_get_num_areas(&Map)) );
284-
str += htmlTableRow ( "Islands", QString::number( Vect_get_num_islands(&Map) ) );
283+
str += htmlTableRow ( QObject::tr("Areas"), QString::number(Vect_get_num_areas(&Map)) );
284+
str += htmlTableRow ( QObject::tr("Islands"), QString::number( Vect_get_num_islands(&Map) ) );
285285

286286

287287
// Box and dimension
@@ -296,27 +296,27 @@ QString QgsGrassModelItem::info()
296296
int proj = window.proj;
297297

298298
G_format_northing (box.N, buffer, proj);
299-
str += htmlTableRow ( "North", QString(buffer) );
299+
str += htmlTableRow ( QObject::tr("North"), QString(buffer) );
300300
G_format_northing (box.S, buffer, proj);
301-
str += htmlTableRow ( "South", QString(buffer) );
301+
str += htmlTableRow ( QObject::tr("South"), QString(buffer) );
302302
G_format_easting (box.E, buffer, proj );
303-
str += htmlTableRow ( "East", QString(buffer) );
303+
str += htmlTableRow ( QObject::tr("East"), QString(buffer) );
304304
G_format_easting (box.W, buffer, proj );
305-
str += htmlTableRow ( "West", QString(buffer) );
305+
str += htmlTableRow ( QObject::tr("West"), QString(buffer) );
306306
if ( is3d )
307307
{
308-
str += htmlTableRow ( "Top", QString::number(box.T) );
309-
str += htmlTableRow ( "Bottom", QString::number(box.B) );
308+
str += htmlTableRow ( QObject::tr("Top"), QString::number(box.T) );
309+
str += htmlTableRow ( QObject::tr("Bottom"), QString::number(box.B) );
310310
}
311311

312-
str += htmlTableRow ( "3D", is3d ? "yes" : "no" );
312+
str += htmlTableRow ( "3D", is3d ? QObject::tr("yes") : QObject::tr("no") );
313313

314314
str += "</table>";
315315

316316
// History
317317
Vect_hist_rewind ( &Map );
318318
char hbuffer[1001];
319-
str += "<p>History<br>";
319+
str += "<p>"+ QObject::tr("History<br>");
320320
QRegExp rx ( "^-+$" );
321321
while ( Vect_hist_read ( hbuffer, 1000, &Map ) != NULL ) {
322322
QString row = QString(hbuffer);
@@ -343,8 +343,8 @@ QString QgsGrassModelItem::info()
343343
case QgsGrassModel::VectorLayer:
344344
{
345345
QString str = tblStart;
346-
str += htmlTableRow("<b>Vector</b>", "<b>" + mMap + "</b>" );
347-
str += htmlTableRow("<b>Layer</b>", "<b>" + mLayer + "</b>" );
346+
str += htmlTableRow(QObject::tr("<b>Vector</b>"), "<b>" + mMap + "</b>" );
347+
str += htmlTableRow(QObject::tr("<b>Layer</b>"), "<b>" + mLayer + "</b>" );
348348

349349
QgsGrass::setLocation( mGisbase, mLocation );
350350

@@ -363,7 +363,7 @@ QString QgsGrassModelItem::info()
363363
int type = QgsGrassProvider::grassLayerType(mLayer);
364364
if (type != -1 )
365365
{
366-
str += htmlTableRow("Features",
366+
str += htmlTableRow( QObject::tr("Features"),
367367
QString::number(Vect_cidx_get_type_count(&Map, field, type)) );
368368
}
369369

@@ -372,10 +372,10 @@ QString QgsGrassModelItem::info()
372372
// Database link
373373
if ( fi )
374374
{
375-
str += htmlTableRow("Driver", QString(fi->driver) );
376-
str += htmlTableRow("Database", QString(fi->database) );
377-
str += htmlTableRow("Table", QString(fi->table) );
378-
str += htmlTableRow("Key column", QString(fi->key) );
375+
str += htmlTableRow(QObject::tr("Driver"), QString(fi->driver) );
376+
str += htmlTableRow(QObject::tr("Database"), QString(fi->database) );
377+
str += htmlTableRow(QObject::tr("Table"), QString(fi->table) );
378+
str += htmlTableRow(QObject::tr("Key column"), QString(fi->key) );
379379
}
380380
}
381381
}

0 commit comments

Comments
 (0)