Merge branch 'master' into gradle-conversion

1 files changed, 5 insertions, 1 deletions

diff --git a/app/src/main/java/org/connectbot/ColorsActivity.java b/app/src/main/java/org/connectbot/ColorsActivity.java
index 4d28732..be5dfb1 100644
--- a/app/src/main/java/org/connectbot/ColorsActivity.java
+++ b/app/src/main/java/org/connectbot/ColorsActivity.java
@@ -17,6 +17,7 @@
 
 package org.connectbot;
 
+import java.text.NumberFormat;
 import java.util.Arrays;
 import java.util.List;
 
@@ -163,6 +164,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 		private final boolean mSquare;
 
 		private final int mResourceLabel;
+		private final NumberFormat mNumberFormatter;
 
 		private Paint mTextPaint;
 		private Paint mShadowPaint;
@@ -181,6 +183,8 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 			mSquare = square;
 			mResourceLabel = resourceLabel;
 
+			mNumberFormatter = NumberFormat.getIntegerInstance(getContext().getResources().getConfiguration().locale);
+
 			DisplayMetrics metrics = context.getResources().getDisplayMetrics();
 
 			mTextPaint = new Paint();
@@ -208,7 +212,7 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 			if (mResourceLabel != -1) {
 				mText = getContext().getResources().getString(mResourceLabel, number);
 			} else {
-				mText = Integer.toString(number);
+				mText = mNumberFormatter.format(number);
 			}
 		}