Improved c:geo localisation

5 files changed, 23 insertions, 12 deletions

diff --git a/main/res/layout/point_controls.xml b/main/res/layout/point_controls.xml
index d41fac9..a2447ea 100644
--- a/main/res/layout/point_controls.xml
+++ b/main/res/layout/point_controls.xml
@@ -8,9 +8,11 @@
 		<TextView style="@style/separator_horizontal_headline"
 			android:text="@string/search_coordinates" />
 	</RelativeLayout>
-	<Button style="@style/button" android:hint="Latitude"
+	<Button style="@style/button"
+		android:hint="@string/waypoint_my_coordinates_latitude"
 		android:id="@+id/buttonLatitude" />
-	<Button style="@style/button" android:hint="Longitude"
+	<Button style="@style/button"
+		android:hint="@string/waypoint_my_coordinates_longitude"
 		android:id="@+id/buttonLongitude" />
 	<Button style="@style/button" android:id="@+id/current"
 		android:text="@string/waypoint_my_coordinates" />
diff --git a/main/res/layout/search.xml b/main/res/layout/search.xml
index 274d128..3ff9369 100644
--- a/main/res/layout/search.xml
+++ b/main/res/layout/search.xml
@@ -35,10 +35,10 @@
 							android:text="@string/search_coordinates" />
 				</RelativeLayout>
 				<Button style="@style/button" 
-					android:hint="Latitude"
+					android:hint="@string/search_coordinates_latitude"
 					android:id="@+id/buttonLatitude"/>
 				<Button style="@style/button" 
-					android:hint="Longitude"
+					android:hint="@string/search_coordinates_longitude"
 					android:id="@+id/buttonLongitude"/>
 				<Button style="@style/button"
 						android:id="@+id/search_coordinates"
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index d09d63c..b562687 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -179,6 +179,7 @@
   <string name="err_tb_forgot_saw">Sorry, c:geo forgot which trackable you saw.</string>
   <string name="err_tb_find">Sorry, c:geo can\'t find trackable</string>
   <string name="err_tb_find_that">Sorry, c:geo can\'t find that trackable.</string>
+  <string name="err_cache_inventory_load_fail">Sorry, c:geo failed to load cache inventory.</string>
 
   <string name="err_waypoint_cache_unknown">Sorry, c:geo doesn\'t know to which cache you want to add waypoint.</string>
   <string name="err_waypoint_unknown">Sorry, c:geo forgot what waypoint you want to display.</string>
@@ -500,6 +501,7 @@
   <string name="cache_attributes">Attributes</string>
   <string name="cache_attributes_no_icons">(refresh cache to show attribute icons)</string>
   <string name="cache_inventory">Inventory</string>
+  <string name="cache_inventory_loading">loading cache inventory…</string>
   <string name="cache_log_offline">Offline log</string>
   <string name="cache_log_images_loading">Loading log Image …</string>
   <string name="cache_log_images_title">Log image</string>
@@ -563,7 +565,9 @@
   <string name="cache_type">Type</string>
   <string name="cache_distance">Distance</string>
   <string name="cache_difficulty">Difficulty</string>
+  <string name="cache_difficulty_of">of</string>
   <string name="cache_terrain">Terrain</string>
+  <string name="cache_terrain_of">of</string>
   <string name="cache_rating">Rating</string>
   <string name="cache_rating_of">of</string>
   <string name="cache_favourite">Favorite</string>
@@ -620,6 +624,8 @@
   <string name="waypoint">Waypoint</string>
   <string name="waypoint_title">Waypoint</string>
   <string name="waypoint_custom">Custom</string>
+  <string name="waypoint_my_coordinates_latitude">Latitude</string>
+  <string name="waypoint_my_coordinates_longitude">Longitude</string>
   <string name="waypoint_my_coordinates">My coordinates</string>
   <string name="waypoint_bearing">Bearing</string>
   <string name="waypoint_distance">Distance</string>
@@ -667,6 +673,8 @@
   <string name="search_bar_hint">Search for caches</string>
   <string name="search_bar_desc">Caches (GC-code, keyword), Trackables (TB-code)</string>
   <string name="search_coordinates">Coordinates</string>
+  <string name="search_coordinates_latitude">Latitude</string>
+  <string name="search_coordinates_longitude">Longitude</string>
   <string name="search_coordinates_button">Search by coordinates</string>
   <string name="search_address">Address</string>
   <string name="search_address_button">Search by address</string>
@@ -940,6 +948,7 @@
     · thiasB (code, loc. DE EN)\n
     · YraFyra (code, loc. SV)\n
     · zenobios (code, loc. DE EN)\n
+    · Pavol Babinčák (code)\n
     \n
     · <a href="http://code.google.com/p/mapsforge/">Mapsforge</a> (OSM-rendering)\n
     · <a href="http://thenounproject.com/">The Noun Project</a> (basis for attribute icons)\n
diff --git a/main/src/cgeo/geocaching/cgeopopup.java b/main/src/cgeo/geocaching/cgeopopup.java
index b5eff42..06a051e 100644
--- a/main/src/cgeo/geocaching/cgeopopup.java
+++ b/main/src/cgeo/geocaching/cgeopopup.java
@@ -321,7 +321,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.difficulty) + " of 5");
+                itemValue.setText(String.format(Locale.getDefault(), "%.1f", cache.difficulty) + ' ' + res.getString(R.string.cache_difficulty_of) + " 5");
                 for (int i = 0; i <= 4; i++) {
                     ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
                     if ((cache.difficulty - i) >= 1.0) {
@@ -344,7 +344,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.terrain) + " of 5");
+                itemValue.setText(String.format(Locale.getDefault(), "%.1f", cache.terrain) + ' ' + res.getString(R.string.cache_terrain_of) + " 5");
                 for (int i = 0; i <= 4; i++) {
                     ImageView star = (ImageView) inflater.inflate(R.layout.star, null);
                     if ((cache.terrain - i) >= 1.0) {
@@ -623,7 +623,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) + " of 5");
+        itemValue.setText(String.format(Locale.getDefault(), "%.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/cgeotrackables.java b/main/src/cgeo/geocaching/cgeotrackables.java
index ed67782..ef6752f 100644
--- a/main/src/cgeo/geocaching/cgeotrackables.java
+++ b/main/src/cgeo/geocaching/cgeotrackables.java
@@ -40,7 +40,7 @@ public class cgeotrackables extends AbstractActivity {
                         waitDialog.dismiss();
                     }
 
-                    showToast("Sorry, c:geo failed to load cache inventory.");
+                    showToast(res.getString(R.string.err_cache_inventory_load_fail));
 
                     finish();
                     return;
@@ -89,7 +89,7 @@ public class cgeotrackables extends AbstractActivity {
 
         setTheme();
         setContentView(R.layout.trackables);
-        setTitle("Trackables");
+        setTitle(res.getString(R.string.trackable));
 
         // get parameters
         Bundle extras = getIntent().getExtras();
@@ -100,12 +100,12 @@ public class cgeotrackables extends AbstractActivity {
         }
 
         if (geocode == null) {
-            showToast("Sorry, c:geo forgot for what cache you want to load trackables.");
+            showToast(res.getString(R.string.err_tb_forgot));
             finish();
             return;
         }
 
-        waitDialog = ProgressDialog.show(this, null, "loading cache inventory...", true);
+        waitDialog = ProgressDialog.show(this, null, res.getString(R.string.cache_inventory_loading), true);
         waitDialog.setCancelable(true);
 
         (new loadInventory()).start();
@@ -149,4 +149,4 @@ public class cgeotrackables extends AbstractActivity {
             return;
         }
     }
-}
\ No newline at end of file
+}