Merge pull request #169 from gab1one/unitutils-locale-fix

hinerm · hinerm · commit f5708d5b39c1 · 2015-06-04T10:35:41.000-05:00
Set locale to US so that the strings are always formated as expected.
diff --git a/src/main/java/org/scijava/util/UnitUtils.java b/src/main/java/org/scijava/util/UnitUtils.java
@@ -31,6 +31,8 @@
 
 package org.scijava.util;
 
+import java.util.Locale;
+
 /**
  * Utility methods for working with units.
  * 
@@ -63,7 +65,7 @@ public static String getAbbreviatedByteLabel(final double totBytes) {
 
 		// format result with 0 decimal places for bytes, or 1 for larger values
 		final String format = pow == 0 ? "%.0f%s" : "%.1f%s";
-		return String.format(format, value, BYTE_UNITS[pow]);
+		return String.format(Locale.US, format, value, BYTE_UNITS[pow]);
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`
`32`	`32`	`package org.scijava.util;`
`33`	`33`
	`34`	`+import java.util.Locale;`
	`35`	`+`
`34`	`36`	`/**`
`35`	`37`	`* Utility methods for working with units.`
`36`	`38`	`*`
`@@ -63,7 +65,7 @@ public static String getAbbreviatedByteLabel(final double totBytes) {`
`63`	`65`
`64`	`66`	`// format result with 0 decimal places for bytes, or 1 for larger values`
`65`	`67`	`final String format = pow == 0 ? "%.0f%s" : "%.1f%s";`
`66`		`- return String.format(format, value, BYTE_UNITS[pow]);`
	`68`	`+ return String.format(Locale.US, format, value, BYTE_UNITS[pow]);`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`}`