fix #820: Go4cache popup needs improvement

7 files changed, 12 insertions, 11 deletions

diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index 9e80937..4b44753 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -870,6 +870,8 @@
   <string name="go4cache_looking_around">Schaut sich um</string>
   <string name="go4cache_tweeting">Twittert</string>
   <string name="go4cache_heading_to">Auf dem Weg zu</string>
-  <string name="go4cache_minutes">Minuten</string>
-  
+  <plurals name="go4cache_time_minutes">
+	<item quantity="one">vor einer Minute</item>
+	<item quantity="other">vor %d Minuten</item>
+  </plurals>
 </resources>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 9ffb66e..ea6a6d1 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -877,6 +877,5 @@
   <string name="go4cache_looking_around">En balade</string>
   <string name="go4cache_tweeting">En train de tweeter</string>
   <string name="go4cache_heading_to">En direction de</string>
-  <string name="go4cache_minutes">minutes</string>
 
 </resources>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 0cdb995..0a3b86b 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -871,5 +871,4 @@
   <string name="go4cache_looking_around">Guardando attorno</string>
   <string name="go4cache_tweeting">Tweeting</string>
   <string name="go4cache_heading_to">Puntando a</string>
-  <string name="go4cache_minutes">Minuti</string>
 </resources>
\ No newline at end of file
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index 869009e..0cd3cd8 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -877,6 +877,5 @@
   <string name="go4cache_looking_around">Prehľadávanie okolia</string>
   <string name="go4cache_tweeting">Posielanie tweetov</string>
   <string name="go4cache_heading_to">Smerovanie k</string>
-  <string name="go4cache_minutes">Minút</string>
       
 </resources>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index e3c8991..3a5884c 100755
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -736,5 +736,4 @@
   <string name="go4cache_looking_around">Tittar omkring</string>
   <string name="go4cache_tweeting">Tweeting</string>
   <string name="go4cache_heading_to">På väg mot</string>
-  <string name="go4cache_minutes">minuter sedan</string>
 </resources>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 6e43ca0..5f818d3 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -892,8 +892,11 @@
   <string name="go4cache_looking_around">Looking around</string>
   <string name="go4cache_tweeting">Tweeting</string>
   <string name="go4cache_heading_to">Heading to</string>
-  <string name="go4cache_minutes">Minutes</string>
-
+  <plurals name="go4cache_time_minutes">
+	<item quantity="one">one Minute ago</item>
+	<item quantity="other">%d Minutes ago</item>
+  </plurals>
+      
   <!-- ====== please, do not translate (and include in translation) things below this line ====== -->
 
   <!-- contributors -->
diff --git a/main/src/cgeo/geocaching/go4cache/Go4CacheUser.java b/main/src/cgeo/geocaching/go4cache/Go4CacheUser.java
index 5bdc209..606d8f3 100644
--- a/main/src/cgeo/geocaching/go4cache/Go4CacheUser.java
+++ b/main/src/cgeo/geocaching/go4cache/Go4CacheUser.java
@@ -84,15 +84,15 @@ public class Go4CacheUser {
         if (null == actionForDisplay) {
             getGeocodeAndAction();
         }
-        return actionForDisplay + getTime();
+        return actionForDisplay + getTime() + ".";
     }
 
     private String getTime() {
-        long minutes = (System.currentTimeMillis() - date.getTime()) / 60000;
+        int minutes = (int) ((System.currentTimeMillis() - date.getTime()) / 60000);
         if (minutes < 0) {
             minutes = 0;
         }
-        return " " + minutes + " " + res.getString(R.string.go4cache_minutes);
+        return " (" + res.getQuantityString(R.plurals.go4cache_time_minutes, minutes, minutes) + ")";
     }
 
     public String getGeocode() {