aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/src/cgeo/geocaching/cgBase.java24
-rw-r--r--main/src/cgeo/geocaching/cgCacheListAdapter.java5
-rw-r--r--main/src/cgeo/geocaching/cgeo.java4
-rw-r--r--main/src/cgeo/geocaching/cgeodetail.java7
-rw-r--r--main/src/cgeo/geocaching/cgeonavigate.java7
-rw-r--r--main/src/cgeo/geocaching/cgeopopup.java8
-rw-r--r--main/src/cgeo/geocaching/cgeovisit.java3
-rw-r--r--main/src/cgeo/geocaching/maps/CGeoMap.java9
8 files changed, 30 insertions, 37 deletions
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 4bd76ac..f025bd5 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -1960,32 +1960,32 @@ public class cgBase {
if (Settings.isUseMetricUnits()) {
if (distance > 100) {
- return String.format(Locale.getDefault(), "%.0f", Double.valueOf(Math.round(distance))) + " km";
+ return String.format("%.0f", Double.valueOf(Math.round(distance))) + " km";
} else if (distance > 10) {
- return String.format(Locale.getDefault(), "%.1f", Double.valueOf(Math.round(distance * 10.0) / 10.0)) + " km";
+ return String.format("%.1f", Double.valueOf(Math.round(distance * 10.0) / 10.0)) + " km";
} else if (distance > 1) {
- return String.format(Locale.getDefault(), "%.2f", Double.valueOf(Math.round(distance * 100.0) / 100.0)) + " km";
+ return String.format("%.2f", Double.valueOf(Math.round(distance * 100.0) / 100.0)) + " km";
} else if (distance > 0.1) {
- return String.format(Locale.getDefault(), "%.0f", Double.valueOf(Math.round(distance * 1000.0))) + " m";
+ return String.format("%.0f", Double.valueOf(Math.round(distance * 1000.0))) + " m";
} else if (distance > 0.01) {
- return String.format(Locale.getDefault(), "%.1f", Double.valueOf(Math.round(distance * 1000.0 * 10.0) / 10.0)) + " m";
+ return String.format("%.1f", Double.valueOf(Math.round(distance * 1000.0 * 10.0) / 10.0)) + " m";
} else {
- return String.format(Locale.getDefault(), "%.2f", Double.valueOf(Math.round(distance * 1000.0 * 100.0) / 100.0)) + " m";
+ return String.format("%.2f", Double.valueOf(Math.round(distance * 1000.0 * 100.0) / 100.0)) + " m";
}
} else {
final Float miles = distance / miles2km;
if (distance > 100) {
- return String.format(Locale.getDefault(), "%.0f", Double.valueOf(Math.round(miles))) + " mi";
+ return String.format("%.0f", Double.valueOf(Math.round(miles))) + " mi";
} else if (distance > 0.5) {
- return String.format(Locale.getDefault(), "%.1f", Double.valueOf(Math.round(miles * 10.0) / 10.0)) + " mi";
+ return String.format("%.1f", Double.valueOf(Math.round(miles * 10.0) / 10.0)) + " mi";
} else if (distance > 0.1) {
- return String.format(Locale.getDefault(), "%.2f", Double.valueOf(Math.round(miles * 100.0) / 100.0)) + " mi";
+ return String.format("%.2f", Double.valueOf(Math.round(miles * 100.0) / 100.0)) + " mi";
} else if (distance > 0.05) {
- return String.format(Locale.getDefault(), "%.0f", Double.valueOf(Math.round(miles * 5280.0))) + " ft";
+ return String.format("%.0f", Double.valueOf(Math.round(miles * 5280.0))) + " ft";
} else if (distance > 0.01) {
- return String.format(Locale.getDefault(), "%.1f", Double.valueOf(Math.round(miles * 5280 * 10.0) / 10.0)) + " ft";
+ return String.format("%.1f", Double.valueOf(Math.round(miles * 5280 * 10.0) / 10.0)) + " ft";
} else {
- return String.format(Locale.getDefault(), "%.2f", Double.valueOf(Math.round(miles * 5280 * 100.0) / 100.0)) + " ft";
+ return String.format("%.2f", Double.valueOf(Math.round(miles * 5280 * 100.0) / 100.0)) + " ft";
}
}
}
diff --git a/main/src/cgeo/geocaching/cgCacheListAdapter.java b/main/src/cgeo/geocaching/cgCacheListAdapter.java
index b28c202..6516c25 100644
--- a/main/src/cgeo/geocaching/cgCacheListAdapter.java
+++ b/main/src/cgeo/geocaching/cgCacheListAdapter.java
@@ -42,7 +42,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -563,11 +562,11 @@ public class cgCacheListAdapter extends ArrayAdapter<cgCache> {
if (cache.getDifficulty() != null && cache.getDifficulty() > 0f) {
cacheInfo.append(" D:");
- cacheInfo.append(String.format(Locale.getDefault(), "%.1f", cache.getDifficulty()));
+ cacheInfo.append(String.format("%.1f", cache.getDifficulty()));
}
if (cache.getTerrain() != null && cache.getTerrain() > 0f) {
cacheInfo.append(" T:");
- cacheInfo.append(String.format(Locale.getDefault(), "%.1f", cache.getTerrain()));
+ cacheInfo.append(String.format("%.1f", cache.getTerrain()));
}
}
if (cache.getSize() != null) {
diff --git a/main/src/cgeo/geocaching/cgeo.java b/main/src/cgeo/geocaching/cgeo.java
index 02c8571..2a4fb13 100644
--- a/main/src/cgeo/geocaching/cgeo.java
+++ b/main/src/cgeo/geocaching/cgeo.java
@@ -554,9 +554,9 @@ public class cgeo extends AbstractActivity {
if (geo.accuracyNow != null) {
if (Settings.isUseMetricUnits()) {
- navAccuracy.setText("±" + String.format(Locale.getDefault(), "%.0f", geo.accuracyNow) + " m");
+ navAccuracy.setText("±" + String.format("%.0f", geo.accuracyNow) + " m");
} else {
- navAccuracy.setText("±" + String.format(Locale.getDefault(), "%.0f", (geo.accuracyNow * 3.2808399)) + " ft");
+ navAccuracy.setText("±" + String.format("%.0f", (geo.accuracyNow * 3.2808399)) + " ft");
}
} else {
navAccuracy.setText(null);
diff --git a/main/src/cgeo/geocaching/cgeodetail.java b/main/src/cgeo/geocaching/cgeodetail.java
index 40b1528..c2e0061 100644
--- a/main/src/cgeo/geocaching/cgeodetail.java
+++ b/main/src/cgeo/geocaching/cgeodetail.java
@@ -68,7 +68,6 @@ import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
@@ -1198,7 +1197,7 @@ public class cgeodetail extends AbstractActivity {
LinearLayout itemStars = (LinearLayout) itemLayout.findViewById(R.id.stars);
itemName.setText(name);
- itemValue.setText(String.format(Locale.getDefault(), "%.1f", value) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
+ itemValue.setText(String.format("%.1f", value) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
for (int i = 0; i <= 4; i++) {
ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
if ((value - i) >= 1.0) {
@@ -1689,10 +1688,10 @@ public class cgeodetail extends AbstractActivity {
dist.append(" ↘");
}
if (Settings.isUseMetricUnits()) {
- dist.append(String.format(Locale.getDefault(), "%.0f", (Math.abs(diff))));
+ dist.append(String.format("%.0f", (Math.abs(diff))));
dist.append(" m");
} else {
- dist.append(String.format(Locale.getDefault(), "%.0f", (Math.abs(diff) * 3.2808399)));
+ dist.append(String.format("%.0f", (Math.abs(diff) * 3.2808399)));
dist.append(" ft");
}
}
diff --git a/main/src/cgeo/geocaching/cgeonavigate.java b/main/src/cgeo/geocaching/cgeonavigate.java
index 2314136..ce49d37 100644
--- a/main/src/cgeo/geocaching/cgeonavigate.java
+++ b/main/src/cgeo/geocaching/cgeonavigate.java
@@ -24,7 +24,6 @@ import android.widget.TextView;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import java.util.Locale;
public class cgeonavigate extends AbstractActivity {
@@ -332,7 +331,7 @@ public class cgeonavigate extends AbstractActivity {
cacheHeading = geo.coordsNow.bearingTo(dstCoords);
distanceView.setText(cgBase.getHumanDistance(geo.coordsNow.distanceTo(dstCoords)));
- headingView.setText(String.format(Locale.getDefault(), "%.0f", cacheHeading) + "°");
+ headingView.setText(String.format("%.0f", cacheHeading) + "°");
}
private class update extends cgUpdateLoc {
@@ -372,9 +371,9 @@ public class cgeonavigate extends AbstractActivity {
if (geo.accuracyNow != null) {
if (Settings.isUseMetricUnits()) {
- navAccuracy.setText("±" + String.format(Locale.getDefault(), "%.0f", geo.accuracyNow) + " m");
+ navAccuracy.setText("±" + String.format("%.0f", geo.accuracyNow) + " m");
} else {
- navAccuracy.setText("±" + String.format(Locale.getDefault(), "%.0f", (geo.accuracyNow * 3.2808399)) + " ft");
+ navAccuracy.setText("±" + String.format("%.0f", (geo.accuracyNow * 3.2808399)) + " ft");
}
} else {
navAccuracy.setText(null);
diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java
index 1574775..136c6b9 100644
--- a/main/src/cgeo/geocaching/cgeopopup.java
+++ b/main/src/cgeo/geocaching/cgeopopup.java
@@ -28,8 +28,6 @@ import android.widget.RelativeLayout;
import android.widget.ScrollView;
import android.widget.TextView;
-import java.util.Locale;
-
public class cgeopopup extends AbstractActivity {
private Boolean fromDetail = false;
@@ -322,7 +320,7 @@ public class cgeopopup extends AbstractActivity {
itemStars = (LinearLayout) itemLayout.findViewById(R.id.stars);
itemName.setText(res.getString(R.string.cache_difficulty));
- itemValue.setText(String.format(Locale.getDefault(), "%.1f", cache.getDifficulty()) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
+ itemValue.setText(String.format("%.1f", cache.getDifficulty()) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
for (int i = 0; i <= 4; i++) {
ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
if ((cache.getDifficulty() - i) >= 1.0) {
@@ -345,7 +343,7 @@ public class cgeopopup extends AbstractActivity {
itemStars = (LinearLayout) itemLayout.findViewById(R.id.stars);
itemName.setText(res.getString(R.string.cache_terrain));
- itemValue.setText(String.format(Locale.getDefault(), "%.1f", cache.getTerrain()) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
+ itemValue.setText(String.format("%.1f", cache.getTerrain()) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
for (int i = 0; i <= 4; i++) {
ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
if ((cache.getTerrain() - i) >= 1.0) {
@@ -626,7 +624,7 @@ public class cgeopopup extends AbstractActivity {
itemStars = (LinearLayout) itemLayout.findViewById(R.id.stars);
itemName.setText(res.getString(R.string.cache_rating));
- itemValue.setText(String.format(Locale.getDefault(), "%.1f", rating) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
+ itemValue.setText(String.format("%.1f", rating) + ' ' + res.getString(R.string.cache_rating_of) + " 5");
for (int i = 0; i <= 4; i++) {
ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
if ((rating - i) >= 1.0) {
diff --git a/main/src/cgeo/geocaching/cgeovisit.java b/main/src/cgeo/geocaching/cgeovisit.java
index af097d2..34084aa 100644
--- a/main/src/cgeo/geocaching/cgeovisit.java
+++ b/main/src/cgeo/geocaching/cgeovisit.java
@@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
-import java.util.Locale;
public class cgeovisit extends cgLogForm {
static final String EXTRAS_FOUND = "found";
@@ -334,7 +333,7 @@ public class cgeovisit extends cgLogForm {
}
private static String ratingTextValue(final double rating) {
- return String.format(Locale.getDefault(), "%.1f", rating);
+ return String.format("%.1f", rating);
}
@Override
diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java
index 4945e69..7ffda46 100644
--- a/main/src/cgeo/geocaching/maps/CGeoMap.java
+++ b/main/src/cgeo/geocaching/maps/CGeoMap.java
@@ -59,7 +59,6 @@ import android.widget.ViewSwitcher.ViewFactory;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
/**
@@ -238,9 +237,9 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
if (secondsRemaining < 40) {
waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + res.getString(R.string.caches_eta_ltm));
} else if (secondsRemaining < 90) {
- waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format(Locale.getDefault(), "%d", (secondsRemaining / 60)) + " " + res.getString(R.string.caches_eta_min));
+ waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format("%d", (secondsRemaining / 60)) + " " + res.getString(R.string.caches_eta_min));
} else {
- waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format(Locale.getDefault(), "%d", (secondsRemaining / 60)) + " " + res.getString(R.string.caches_eta_mins));
+ waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format("%d", (secondsRemaining / 60)) + " " + res.getString(R.string.caches_eta_mins));
}
}
} else if (msg.what == FINISHED_LOADING_DETAILS) {
@@ -676,9 +675,9 @@ public class CGeoMap extends AbstractMap implements OnDragListener, ViewFactory
if (etaTime < 0.4) {
waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + res.getString(R.string.caches_eta_ltm));
} else if (etaTime < 1.5) {
- waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format(Locale.getDefault(), "%.0f", etaTime) + " " + res.getString(R.string.caches_eta_min));
+ waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format("%.0f", etaTime) + " " + res.getString(R.string.caches_eta_min));
} else {
- waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format(Locale.getDefault(), "%.0f", etaTime) + " " + res.getString(R.string.caches_eta_mins));
+ waitDialog.setMessage(res.getString(R.string.caches_downloading) + " " + String.format("%.0f", etaTime) + " " + res.getString(R.string.caches_eta_mins));
}
waitDialog.show();
generated by cgit v1.1 at 2025-11-11 19:37:11 +0000