diff options
| -rw-r--r-- | main/res/values-sk/strings.xml | 2 | ||||
| -rw-r--r-- | main/res/values/strings.xml | 1 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/cgBase.java | 45 |
3 files changed, 3 insertions, 45 deletions
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml index 061ef53..6935b59 100644 --- a/main/res/values-sk/strings.xml +++ b/main/res/values-sk/strings.xml @@ -417,6 +417,8 @@ <string name="init_captcha">Zobraziť CAPTCHA, ak je to potrebné</string> <string name="init_useenglish">Používať angličtinu v c:geo\n(vyžaduje reštart)</string> <string name="init_exclude">Nezobrazovať vlastné a nájdené skrýše</string> + <string name="init_showwaypoints">Body trasy na aktívnej mape</string> + <string name="init_showwaypoint_description">Úroveň, od ktorej zobraziť body trasy na aktívnej mape.</string> <string name="init_disabled">Nezobrazovať zrušené skrýše</string> <string name="init_offline">Ukladať mapy pre použitie offline</string> <string name="init_save_log_img">Uložiť obrázky zo záznamov</string> diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml index 18ffa66..f812bc5 100644 --- a/main/res/values/strings.xml +++ b/main/res/values/strings.xml @@ -946,6 +946,7 @@ · <a href="http://www.rfc1149.net/sam.html">Samuel Tardieu</a> (code, localization FR)\n · serenity (localization FR)\n · Shan, a.k.a. ShakurNO (localization NO)\n + · stephanme/Geoteufel (code)\n · thiasB (code, loc. DE EN)\n · YraFyra (code, loc. SV)\n · zenobios (code, loc. DE EN)\n diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java index 37fd952..19ad634 100644 --- a/main/src/cgeo/geocaching/cgBase.java +++ b/main/src/cgeo/geocaching/cgBase.java @@ -2334,35 +2334,6 @@ public class cgBase { return trackables; } - public static String stripParagraphs(String text) { - if (StringUtils.isBlank(text)) { - return ""; - } - - final Pattern patternP = Pattern.compile("(<p>|</p>|<br \\/>|<br>)", Pattern.CASE_INSENSITIVE); - final Pattern patternP2 = Pattern.compile("([ ]+)", Pattern.CASE_INSENSITIVE); - final Matcher matcherP = patternP.matcher(text); - final Matcher matcherP2 = patternP2.matcher(text); - - matcherP.replaceAll(" "); - matcherP2.replaceAll(" "); - - return text.trim(); - } - - public static String stripTags(String text) { - if (StringUtils.isBlank(text)) { - return ""; - } - - final Pattern patternP = Pattern.compile("(<[^>]+>)", Pattern.CASE_INSENSITIVE); - final Matcher matcherP = patternP.matcher(text); - - matcherP.replaceAll(" "); - - return text.trim(); - } - public String getHumanDistance(final Float distance) { if (distance == null) { return "?"; @@ -2400,22 +2371,6 @@ public class cgBase { } } - public String getHumanSpeed(float speed) { - double kph = speed * 3.6; - String unit = "km/h"; - - if (this.settings.units == cgSettings.unitsImperial) { - kph /= miles2km; - unit = "mph"; - } - - if (kph < 10.0) { - return String.format(Locale.getDefault(), "%.1f", Double.valueOf((Math.round(kph * 10.0) / 10.0))) + " " + unit; - } else { - return String.format(Locale.getDefault(), "%.0f", Double.valueOf(Math.round(kph))) + " " + unit; - } - } - private static String formatCoordinate(final Double coordIn, final boolean degrees, final String direction, final String digitsFormat) { if (coordIn == null) { return ""; |