aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/res/values-ca/strings.xml1
-rw-r--r--main/res/values-cs/strings.xml1
-rw-r--r--main/res/values-da/strings.xml1
-rw-r--r--main/res/values-de/strings.xml1
-rw-r--r--main/res/values-es/strings.xml3
-rw-r--r--main/res/values-fr/strings.xml1
-rw-r--r--main/res/values-hu/strings.xml1
-rw-r--r--main/res/values-it/strings.xml1
-rw-r--r--main/res/values-lt/strings.xml1
-rw-r--r--main/res/values-nb/strings.xml1
-rw-r--r--main/res/values-nl/strings.xml1
-rw-r--r--main/res/values-pl/strings.xml1
-rw-r--r--main/res/values-pt/strings.xml1
-rw-r--r--main/res/values-ro/strings.xml1
-rw-r--r--main/res/values-sk/strings.xml1
-rw-r--r--main/res/values-sl/strings.xml1
-rw-r--r--main/res/values-sv/strings.xml1
-rw-r--r--main/res/values/strings.xml2
-rw-r--r--main/src/cgeo/geocaching/filter/PopularityRatioFilter.java8
19 files changed, 6 insertions, 23 deletions
diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml
index e2d2c8f..5ba01e1 100644
--- a/main/res/values-ca/strings.xml
+++ b/main/res/values-ca/strings.xml
@@ -1171,7 +1171,6 @@
<item quantity="one">%s preferit</item>
<item quantity="other">%s preferits</item>
</plurals>
- <string name="percent_favorite_points">% \ preferits</string>
<string name="cgeo_shortcut">Drecera del c:geo</string>
<string name="create_shortcut">Crea una drecera</string>
<string name="send">Envia</string>
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 9ab2d11..d9848b9 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -1146,7 +1146,6 @@
<string name="tts_one_oclock">jedna hodina</string>
<string name="tts_oclock">%s hodin</string>
<string name="clipboard_copy_ok">Zkopírováno do schránky</string>
- <string name="percent_favorite_points">%\ oblíbené</string>
<string name="cgeo_shortcut">c:geo zástupce</string>
<string name="create_shortcut">Vytvořit zástupce</string>
<string name="send">Odeslat</string>
diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index e86ebce..e1c9737 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -1150,7 +1150,6 @@
<item quantity="one">%s favorit</item>
<item quantity="other">%s favoritter</item>
</plurals>
- <string name="percent_favorite_points">% favoritter</string>
<string name="cgeo_shortcut">c:geo genvej</string>
<string name="create_shortcut">Opret genvej</string>
<string name="send">Send</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 671a098..2eba660 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -1168,7 +1168,6 @@
<item quantity="one">%s Favorit</item>
<item quantity="other">%s Favoriten</item>
</plurals>
- <string name="percent_favorite_points">% Favoriten</string>
<string name="cgeo_shortcut">c:geo Shortcut</string>
<string name="create_shortcut">Shortcut erstellen</string>
<string name="send">Senden</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 17e318d..1c247f7 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -835,5 +835,4 @@
<string name="tts_one_oclock">La una en punto</string>
<string name="tts_oclock">%s en punto</string>
<string name="clipboard_copy_ok">Copiado al portapapeles</string>
- <string name="percent_favorite_points">% \ favoritos</string>
-</resources>
+ </resources>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 0287b48..8bbb50e 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -1169,7 +1169,6 @@
<item quantity="one">%s favori</item>
<item quantity="other">%s favoris</item>
</plurals>
- <string name="percent_favorite_points">%\ favoris</string>
<string name="cgeo_shortcut">c:geo raccourci</string>
<string name="create_shortcut">Créer un raccourci</string>
<string name="send">Envoyer</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index 8352fb8..dbe5127 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -1165,7 +1165,6 @@
<item quantity="one">%s kedvenc pont</item>
<item quantity="other">%s kedvenc pont</item>
</plurals>
- <string name="percent_favorite_points">%\ kedvenc pont</string>
<string name="cgeo_shortcut">c:geo parancsikon</string>
<string name="create_shortcut">Parancsikon létrehozása</string>
<string name="send">Küldés</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index e079b1d..a4e164b 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -1165,7 +1165,6 @@
<item quantity="one">%s preferito</item>
<item quantity="other">%s preferiti</item>
</plurals>
- <string name="percent_favorite_points">%\ preferiti</string>
<string name="cgeo_shortcut">collegamento a c:geo</string>
<string name="create_shortcut">Crea collegamento</string>
<string name="send">Invia</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index d0e6f9d..1c3cd6a 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -1163,7 +1163,6 @@
<item quantity="few">%s mėgiamos</item>
<item quantity="other">%s mėgiamų</item>
</plurals>
- <string name="percent_favorite_points">%\ mėgiamos</string>
<string name="cgeo_shortcut">c:geo nuoroda</string>
<string name="create_shortcut">Sukurti nuorodą</string>
<string name="send">Siųsti</string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index b007671..20141d1 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -1143,7 +1143,6 @@
<item quantity="one">%s favoritt</item>
<item quantity="other">%s favoritt</item>
</plurals>
- <string name="percent_favorite_points">%\ favoritter</string>
<string name="cgeo_shortcut">c:geo-snartvei</string>
<string name="create_shortcut">Opprett snarvei</string>
<string name="send">Send</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index e949042..4e5a865 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -1170,7 +1170,6 @@
<item quantity="one">%s favoriet</item>
<item quantity="other">%s favorieten</item>
</plurals>
- <string name="percent_favorite_points">%\ favorieten</string>
<string name="cgeo_shortcut">c:geo snelkoppeling</string>
<string name="create_shortcut">Maak snelkoppeling</string>
<string name="send">Verzenden</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 13d1930..bedd758 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -1171,7 +1171,6 @@
<item quantity="few">%s ulubione</item>
<item quantity="other">%s ulubionych</item>
</plurals>
- <string name="percent_favorite_points">%\ ulubionych</string>
<string name="cgeo_shortcut">skrót do c:geo</string>
<string name="create_shortcut">Utwórz skrót</string>
<string name="send">Wyślij</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 7702571..76d0e79 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -1155,7 +1155,6 @@
<item quantity="one">%s favorito</item>
<item quantity="other">%s favoritos</item>
</plurals>
- <string name="percent_favorite_points">%\ favoritos</string>
<string name="cgeo_shortcut">Atalho c:geo</string>
<string name="create_shortcut">Criar atalho</string>
<string name="send">Enviar</string>
diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml
index f875043..5323b12 100644
--- a/main/res/values-ro/strings.xml
+++ b/main/res/values-ro/strings.xml
@@ -1132,7 +1132,6 @@
<string name="tts_one_oclock">ora unu</string>
<string name="tts_oclock">ora %s</string>
<string name="clipboard_copy_ok">Copiat</string>
- <string name="percent_favorite_points">%\ favorite</string>
<string name="cgeo_shortcut">legătură la c:geo</string>
<string name="create_shortcut">Crează scurtătură</string>
<string name="send">Trimite</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 230dcd3..a711073 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -1172,7 +1172,6 @@
<item quantity="few">%s obľúbené</item>
<item quantity="other">%s obľúbených</item>
</plurals>
- <string name="percent_favorite_points">% \ obľúbených</string>
<string name="cgeo_shortcut">c:Geo odkaz</string>
<string name="create_shortcut">Vytvoriť odkaz</string>
<string name="send">Odoslať</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index b6cd540..e09d6a1 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -1183,7 +1183,6 @@
<item quantity="few">%s favoritov</item>
<item quantity="other">%s favoritov</item>
</plurals>
- <string name="percent_favorite_points">%\ favoritov</string>
<string name="cgeo_shortcut">Bližnjica c:geo</string>
<string name="create_shortcut">Ustvari bližnjico</string>
<string name="send">Pošlji</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index cebf782..58b2169 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -1166,7 +1166,6 @@
<item quantity="one">igår</item>
<item quantity="other">%d dagar sedan</item>
</plurals>
- <string name="percent_favorite_points">%\ favoriter</string>
<string name="cgeo_shortcut">c:geo genväg</string>
<string name="create_shortcut">Skapa genväg</string>
<string name="send">Skicka</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index aae852e..ddfd313 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -1275,7 +1275,7 @@
<item quantity="other">%s favorites</item>
</plurals>
- <string name="percent_favorite_points">%\ favorites</string>
+ <string name="more_than_percent_favorite_points">> %d%% favorites</string>
<!-- shortcuts -->
<string name="cgeo_shortcut">c:geo shortcut</string>
diff --git a/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java b/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java
index ed8c074..f7ac4db 100644
--- a/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java
+++ b/main/src/cgeo/geocaching/filter/PopularityRatioFilter.java
@@ -16,7 +16,7 @@ class PopularityRatioFilter extends AbstractFilter {
private final int minRatio;
private final int maxRatio;
- public PopularityRatioFilter(String name, final int minRatio, final int maxRatio) {
+ public PopularityRatioFilter(final String name, final int minRatio, final int maxRatio) {
super(name);
this.minRatio = minRatio;
this.maxRatio = maxRatio;
@@ -35,11 +35,11 @@ class PopularityRatioFilter extends AbstractFilter {
return ratio > minRatio && ratio <= maxRatio;
}
- private static int getFindsCount(Geocache cache) {
+ private static int getFindsCount(final Geocache cache) {
if (cache.getLogCounts().isEmpty()) {
cache.setLogCounts(DataStore.loadLogCounts(cache.getGeocode()));
}
- Integer logged = cache.getLogCounts().get(LogType.FOUND_IT);
+ final Integer logged = cache.getLogCounts().get(LogType.FOUND_IT);
if (logged != null) {
return logged;
}
@@ -55,7 +55,7 @@ class PopularityRatioFilter extends AbstractFilter {
final List<IFilter> filters = new ArrayList<>(RATIOS.length);
for (final int minRange : RATIOS) {
final int maxRange = Integer.MAX_VALUE;
- final String name = "> " + minRange + " " + CgeoApplication.getInstance().getResources().getString(R.string.percent_favorite_points);
+ final String name = CgeoApplication.getInstance().getResources().getString(R.string.more_than_percent_favorite_points, minRange);
filters.add(new PopularityRatioFilter(name, minRange, maxRange));
}
return filters;