improved number formatting

baloise · Apr 10, 2015 · f83c7ae · f83c7ae
1 parent 11bdb85
commit f83c7ae
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/src/main/java/com/baloise/confluence/dashboardplus/JenkinsJobStatusMacro.java b/src/main/java/com/baloise/confluence/dashboardplus/JenkinsJobStatusMacro.java
@@ -1,6 +1,7 @@
 package com.baloise.confluence.dashboardplus;
 
 import java.io.Serializable;
+import java.text.NumberFormat;
 import java.util.Date;
 import java.util.Map;
 
@@ -253,11 +254,13 @@ private void populateVeloContext(Params params,
 			veloContext.put(VELO_PARAM_NAME_LASTRUNDURATION,
 					formatDuration(slData.getLastRunDurationInMillis()));
 
-			String testInfo = String.valueOf(slData.getTestPassCount());
-			if (slData.getTestTotalCount() == 0) {
+			NumberFormat numberFormatter = newNumberFormatter();
+			String testInfo = numberFormatter.format(slData.getTestPassCount());
+			if (slData.getTestTotalCount() <= 1) {
 				testInfo += " test"; //$NON-NLS-1$
 			} else {
-				testInfo += "/" + slData.getTestTotalCount()
+				testInfo += "/"
+						+ numberFormatter.format(slData.getTestTotalCount())
 						+ " tests (" //$NON-NLS-1$ //$NON-NLS-2$
 						+ newPercentFormatter().format(
 								slData.calcSuccessRatio()) + ")"; //$NON-NLS-1$

diff --git a/src/main/java/com/baloise/confluence/dashboardplus/SonarTestStatusMacro.java b/src/main/java/com/baloise/confluence/dashboardplus/SonarTestStatusMacro.java
@@ -1,6 +1,7 @@
 package com.baloise.confluence.dashboardplus;
 
 import java.io.Serializable;
+import java.text.NumberFormat;
 import java.util.Date;
 import java.util.Map;
 
@@ -193,12 +194,13 @@ private void populateVeloContext(Params params,
 		veloContext.put(VELO_PARAM_NAME_LASTRUNDURATION,
 				formatDuration(slData.getLastRunDurationInMillis()));
 
-		String testInfo = String.valueOf(slData.getTestPassCount());
-		if (slData.getTestTotalCount() == 0) {
+		NumberFormat numberFormatter = newNumberFormatter();
+		String testInfo = numberFormatter.format(slData.getTestPassCount());
+		if (slData.getTestTotalCount() <= 1) {
 			testInfo += " test"; //$NON-NLS-1$
 		} else {
 			testInfo += "/" //$NON-NLS-1$
-					+ slData.getTestTotalCount()
+					+ numberFormatter.format(slData.getTestTotalCount())
 					+ " tests (" //$NON-NLS-1$
 					+ newPercentFormatter().format(slData.calcSuccessRatio())
 					+ ")"; //$NON-NLS-1$

diff --git a/src/main/java/com/baloise/confluence/dashboardplus/StatusLightBasedMacro.java b/src/main/java/com/baloise/confluence/dashboardplus/StatusLightBasedMacro.java
@@ -176,4 +176,22 @@ protected FriendlyDateFormatter newFriendlyDateFormatter() {
 				new Date(), dateFormatter);
 		return friendlyDateFormatter;
 	}
+
+	protected NumberFormat newNumberFormatter() {
+		// Get current user's timezone, or default one
+		User authUser = AuthenticatedUserThreadLocal.getUser();
+		NumberFormat result = null;
+		if (authUser != null) {
+			ConfluenceUserPreferences prefs = userAccessor
+					.getConfluenceUserPreferences(authUser);
+			if (prefs != null && prefs.getLocale() != null) {
+				result = NumberFormat.getNumberInstance(prefs.getLocale());
+			}
+		}
+		if (result == null) {
+			// anonymous
+			result = NumberFormat.getNumberInstance();
+		}
+		return result;
+	}
 }