Skip to content

Commit a39e6a7

Browse files
author
gsherman
committed
Applied patch from lubaby to fully internationalize the GRASS plugin (ticket #697)
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6917 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 5814689 commit a39e6a7

File tree

12 files changed

+236
-236
lines changed

12 files changed

+236
-236
lines changed

‎src/plugins/grass/qgsgrassattributes.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@ int QgsGrassAttributes::addTab ( const QString & label )
163163
tb->setRowReadOnly ( 0, TRUE );
164164
tb->setRowReadOnly ( 1, TRUE );
165165

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

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

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

175175
tabCats->addTab ( tb, label );
@@ -311,9 +311,9 @@ void QgsGrassAttributes::updateAttributes ( )
311311

312312
if ( !error->isEmpty() ) {
313313
QMessageBox::warning( 0, tr("Warning"), *error );
314-
resultLabel->setText ( "ERROR" );
314+
resultLabel->setText ( tr("ERROR") );
315315
} else {
316-
resultLabel->setText ( "OK" );
316+
resultLabel->setText ( tr("OK") );
317317
}
318318

319319
delete error;

‎src/plugins/grass/qgsgrassbrowser.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,8 @@ void QgsGrassBrowser::copyMap()
269269
{
270270
suggest = map;
271271
}
272-
QString newName = ed.getItem ( element, "New name",
273-
"New name", suggest, source, &ok );
272+
QString newName = ed.getItem ( element, tr("New name"),
273+
tr("New name"), suggest, source, &ok );
274274

275275
if ( !ok ) return;
276276

@@ -335,8 +335,8 @@ void QgsGrassBrowser::renameMap()
335335

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

341341
if ( !ok ) return;
342342

‎src/plugins/grass/qgsgrassmapcalc.cpp‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,19 @@ QString QgsGrassModelItem::info()
131131
switch ( mType )
132132
{
133133
case QgsGrassModel::Location:
134-
return "Location: " + mLocation;
134+
return QObject::tr("Location: ","Metadata in GRASS Browser") + mLocation;
135135
break;
136136
case QgsGrassModel::Mapset:
137-
return "Location: " + mLocation + "<br>Mapset: " + mMapset;
137+
return QObject::tr("Location: ","Metadata in GRASS Browser") + mLocation + QObject::tr("<br>Mapset: ","Metadata in GRASS Browser") + mMapset;
138138
break;
139139
case QgsGrassModel::Vectors:
140140
case QgsGrassModel::Rasters:
141-
return "Location: " + mLocation + "<br>Mapset: " + mMapset;
141+
return QObject::tr("Location: ") + mLocation + QObject::tr("<br>Mapset: ") + mMapset;
142142
break;
143143
case QgsGrassModel::Raster:
144144
{
145145
QString str = tblStart;
146-
str += htmlTableRow("<b>Raster</b>", "<b>" + mMap + "</b>" );
146+
str += htmlTableRow(QObject::tr("<b>Raster</b>"), "<b>" + mMap + "</b>" );
147147

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

168168
rasterType = G_raster_map_type( mMap.toLocal8Bit().data(),
169169
mMapset.toLocal8Bit().data() );
@@ -186,7 +186,7 @@ QString QgsGrassModelItem::info()
186186
{
187187
format += "unknown";
188188
}
189-
str += htmlTableRow ( "Format", format );
189+
str += htmlTableRow ( QObject::tr("Format"), format );
190190
}
191191

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

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

204204
// History
@@ -209,12 +209,12 @@ QString QgsGrassModelItem::info()
209209
if ( QString(hist.datsrc_1).length() > 0
210210
|| QString(hist.datsrc_2).length() > 0 )
211211
{
212-
str += htmlTableRow ( "Data source", QString(hist.datsrc_1) + " "
212+
str += htmlTableRow ( QObject::tr("Data source"), QString(hist.datsrc_1) + " "
213213
+ QString(hist.datsrc_2) );
214214
}
215215
if ( QString(hist.keywrd).length() > 0 )
216216
{
217-
str += htmlTableRow ( "Data description", QString(hist.keywrd) );
217+
str += htmlTableRow ( QObject::tr("Data description"), QString(hist.keywrd) );
218218
}
219219
if ( hist.edlinecnt > 0 )
220220
{
@@ -223,7 +223,7 @@ QString QgsGrassModelItem::info()
223223
{
224224
h += QString(hist.edhist[i]) + "<br>";
225225
}
226-
str += htmlTableRow ( "Comments", h);
226+
str += htmlTableRow ( QObject::tr("Comments"), h);
227227
}
228228
}
229229

@@ -238,7 +238,7 @@ QString QgsGrassModelItem::info()
238238
{
239239
if ( Cats.ncats > 0 )
240240
{
241-
str += "<tr><td colspan=2>Categories</td></tr>";
241+
str += "<tr><td colspan=2>" + QObject::tr("Categories") + "</td></tr>";
242242
for ( int i = 0; i < Cats.ncats; i++)
243243
{
244244
str += htmlTableRow (
@@ -258,7 +258,7 @@ QString QgsGrassModelItem::info()
258258
case QgsGrassModel::Vector:
259259
{
260260
QString str = tblStart;
261-
str += htmlTableRow("<b>Vector</b>", "<b>" + mMap + "</b>" );
261+
str += htmlTableRow(QObject::tr("<b>Vector</b>"), "<b>" + mMap + "</b>" );
262262

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

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

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

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

287287

288288
// Box and dimension
@@ -297,27 +297,27 @@ QString QgsGrassModelItem::info()
297297
int proj = window.proj;
298298

299299
G_format_northing (box.N, buffer, proj);
300-
str += htmlTableRow ( "North", QString(buffer) );
300+
str += htmlTableRow ( QObject::tr("North"), QString(buffer) );
301301
G_format_northing (box.S, buffer, proj);
302-
str += htmlTableRow ( "South", QString(buffer) );
302+
str += htmlTableRow ( QObject::tr("South"), QString(buffer) );
303303
G_format_easting (box.E, buffer, proj );
304-
str += htmlTableRow ( "East", QString(buffer) );
304+
str += htmlTableRow ( QObject::tr("East"), QString(buffer) );
305305
G_format_easting (box.W, buffer, proj );
306-
str += htmlTableRow ( "West", QString(buffer) );
306+
str += htmlTableRow ( QObject::tr("West"), QString(buffer) );
307307
if ( is3d )
308308
{
309-
str += htmlTableRow ( "Top", QString::number(box.T) );
310-
str += htmlTableRow ( "Bottom", QString::number(box.B) );
309+
str += htmlTableRow ( QObject::tr("Top"), QString::number(box.T) );
310+
str += htmlTableRow ( QObject::tr("Bottom"), QString::number(box.B) );
311311
}
312312

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

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

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

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

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

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

0 commit comments

Comments
 (0)