Don't show 'unknown' suffix for when displaying measurements

nyalldawson · nyalldawson · commit 99e52af4aa16 · 2016-02-13T11:36:51.000+11:00
diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp
@@ -1081,11 +1081,11 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,
       }
       break;
     case QGis::UnknownUnit:
-      unitLabel = QObject::tr( " unknown" );
-      //intentional fall-through
-      FALLTHROUGH;
+      unitLabel.clear();
+      break;
     default:
       QgsDebugMsg( QString( "Error: not picked up map units - actual value = %1" ).arg( u ) );
+      break;
   }
 
   return QLocale::system().toString( value, 'f', decimals ) + unitLabel;

Original file line number	Diff line number	Diff line change
`@@ -1081,11 +1081,11 @@ QString QgsDistanceArea::textUnit( double value, int decimals, QGis::UnitType u,`
`1081`	`1081`	`}`
`1082`	`1082`	`break;`
`1083`	`1083`	`case QGis::UnknownUnit:`
`1084`		`- unitLabel = QObject::tr( " unknown" );`
`1085`		`- //intentional fall-through`
`1086`		`- FALLTHROUGH;`
	`1084`	`+ unitLabel.clear();`
	`1085`	`+ break;`
`1087`	`1086`	`default:`
`1088`	`1087`	`QgsDebugMsg( QString( "Error: not picked up map units - actual value = %1" ).arg( u ) );`
	`1088`	`+ break;`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`	`1091`	`return QLocale::system().toString( value, 'f', decimals ) + unitLabel;`