1 files changed, 6 insertions, 5 deletions
diff --git a/main/src/cgeo/geocaching/geopoint/Units.java b/main/src/cgeo/geocaching/geopoint/Units.java
index b99e00e..d00e075 100644
--- a/main/src/cgeo/geocaching/geopoint/Units.java
+++ b/main/src/cgeo/geocaching/geopoint/Units.java
@@ -4,6 +4,8 @@ import cgeo.geocaching.settings.Settings;
 
 import org.apache.commons.lang3.tuple.ImmutablePair;
 
+import java.util.Locale;
+
 public class Units {
 
     public static ImmutablePair<Double, String> scaleDistance(final double distanceKilometers) {
@@ -51,11 +53,10 @@ public class Units {
         return getDistanceFromKilometers(meters / 1000f);
     }
 
-    public static String getSpeed(float kilometersPerHour) {
-        final String speed = getDistanceFromKilometers(kilometersPerHour);
-        if (speed.endsWith("mi")) {
-            return speed.substring(0, speed.length() - 2) + "mph";
+    public static String getSpeed(final float kilometersPerHour) {
+        if (Settings.isUseImperialUnits()) {
+            return String.format(Locale.US, "%.0f mph", kilometersPerHour / IConversion.MILES_TO_KILOMETER);
         }
-        return speed + (!Settings.isUseImperialUnits() ? "/h" : "ph");
+        return String.format(Locale.US, "%.0f km/h", kilometersPerHour);
     }
 }