make some rendering errors translatable

jef-n · jef-n · commit a34240d5f9d3 · 2014-08-20T12:08:07.000+02:00
diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp
@@ -156,7 +156,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin
 
     if ( !ml )
     {
-      mErrors.append( Error( layerId, "Layer not found in registry." ) );
+      mErrors.append( Error( layerId, tr( "Layer not found in registry." ) ) );
       continue;
     }
 
@@ -188,7 +188,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin
       QgsDebugMsg( "extent: " + r1.toString() );
       if ( !r1.isFinite() || !r2.isFinite() )
       {
-        mErrors.append( Error( layerId, "There was a problem transforming layer's' extent. Layer skipped." ) );
+        mErrors.append( Error( layerId, tr( "There was a problem transforming the layer's extent. Layer skipped." ) ) );
         continue;
       }
     }
@@ -237,7 +237,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin
                                       mSettings.outputImageFormat() );
       if ( mypFlattenedImage->isNull() )
       {
-        mErrors.append( Error( layerId, "Insufficient memory for image " + QString::number( mSettings.outputSize().width() ) + "x" + QString::number( mSettings.outputSize().height() ) ) );
+        mErrors.append( Error( layerId, tr( "Insufficient memory for image %1x%2" ).arg( mSettings.outputSize().width() ).arg( mSettings.outputSize().height() ) ) );
         delete mypFlattenedImage;
         layerJobs.removeLast();
         continue;
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -113,7 +113,7 @@ bool QgsVectorLayerRenderer::render()
 
   if ( !mRendererV2 )
   {
-    mErrors.append( "No renderer for drawing." );
+    mErrors.append( QObject::tr( "No renderer for drawing." ) );
     return false;
   }
 
@@ -146,7 +146,7 @@ bool QgsVectorLayerRenderer::render()
       try
       {
         QgsPoint center = mContext.extent().center();
-        double rectSize = ct->sourceCrs().geographicFlag() ?  0.0008983 /* ~100/(40075014/360=111319.4833) */ : 100;
+        double rectSize = ct->sourceCrs().geographicFlag() ? 0.0008983 /* ~100/(40075014/360=111319.4833) */ : 100;
 
         QgsRectangle sourceRect = QgsRectangle( center.x(), center.y(), center.x() + rectSize, center.y() + rectSize );
         QgsRectangle targetRect = ct->transform( sourceRect );

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin`
`156`	`156`
`157`	`157`	`if ( !ml )`
`158`	`158`	`{`
`159`		`- mErrors.append( Error( layerId, "Layer not found in registry." ) );`
	`159`	`+ mErrors.append( Error( layerId, tr( "Layer not found in registry." ) ) );`
`160`	`160`	`continue;`
`161`	`161`	`}`
`162`	`162`
`@@ -188,7 +188,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin`
`188`	`188`	`QgsDebugMsg( "extent: " + r1.toString() );`
`189`	`189`	`if ( !r1.isFinite() \|\| !r2.isFinite() )`
`190`	`190`	`{`
`191`		`- mErrors.append( Error( layerId, "There was a problem transforming layer's' extent. Layer skipped." ) );`
	`191`	`+ mErrors.append( Error( layerId, tr( "There was a problem transforming the layer's extent. Layer skipped." ) ) );`
`192`	`192`	`continue;`
`193`	`193`	`}`
`194`	`194`	`}`
`@@ -237,7 +237,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter* painter, QgsPalLabelin`
`237`	`237`	`mSettings.outputImageFormat() );`
`238`	`238`	`if ( mypFlattenedImage->isNull() )`
`239`	`239`	`{`
`240`		`- mErrors.append( Error( layerId, "Insufficient memory for image " + QString::number( mSettings.outputSize().width() ) + "x" + QString::number( mSettings.outputSize().height() ) ) );`
	`240`	`+ mErrors.append( Error( layerId, tr( "Insufficient memory for image %1x%2" ).arg( mSettings.outputSize().width() ).arg( mSettings.outputSize().height() ) ) );`
`241`	`241`	`delete mypFlattenedImage;`
`242`	`242`	`layerJobs.removeLast();`
`243`	`243`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ bool QgsVectorLayerRenderer::render()`
`113`	`113`
`114`	`114`	`if ( !mRendererV2 )`
`115`	`115`	`{`
`116`		`- mErrors.append( "No renderer for drawing." );`
	`116`	`+ mErrors.append( QObject::tr( "No renderer for drawing." ) );`
`117`	`117`	`return false;`
`118`	`118`	`}`
`119`	`119`
`@@ -146,7 +146,7 @@ bool QgsVectorLayerRenderer::render()`
`146`	`146`	`try`
`147`	`147`	`{`
`148`	`148`	`QgsPoint center = mContext.extent().center();`
`149`		`- double rectSize = ct->sourceCrs().geographicFlag() ? 0.0008983 /* ~100/(40075014/360=111319.4833) */ : 100;`
	`149`	`+ double rectSize = ct->sourceCrs().geographicFlag() ? 0.0008983 /* ~100/(40075014/360=111319.4833) */ : 100;`
`150`	`150`
`151`	`151`	`QgsRectangle sourceRect = QgsRectangle( center.x(), center.y(), center.x() + rectSize, center.y() + rectSize );`
`152`	`152`	`QgsRectangle targetRect = ct->transform( sourceRect );`