friend map translations

diff --git a/app/views/user/_friend_map.rhtml b/app/views/user/_friend_map.rhtml
index 33d6e1f8566c1665c52b58a50bc2e8d98c438f3b..c6d5f8afe498c776857590c4deab81c67572434d 100644 (file)
--- a/app/views/user/_friend_map.rhtml
+++ b/app/views/user/_friend_map.rhtml
@@ -45,14 +45,14 @@
     setMapCenter(centre, zoom);
 
     <% if marker %>
     setMapCenter(centre, zoom);
 
     <% if marker %>

-    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "Your location");
+    marker = addMarkerToMap(new OpenLayers.LonLat(<%= mlon %>, <%= mlat %>), null, "<%= t 'user.friend_map.your location' %>");

     <% end %>
 
     var near_icon = OpenLayers.Marker.defaultIcon();
     near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";;
     var i = nearest.length;
     while( i-- ) {
     <% end %>
 
     var near_icon = OpenLayers.Marker.defaultIcon();
     near_icon.url = OpenLayers.Util.getImagesLocation() + "marker-green.png";;
     var i = nearest.length;
     while( i-- ) {

-      var description = 'Nearby mapper: <a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>'
+      var description = '<%= t 'user.friend_map.nearby mapper'%><a href="/user/'+nearest[i].display_name+'">'+nearest[i].display_name+'</a>'

       var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
     }
 
       var nearmarker = addMarkerToMap(new OpenLayers.LonLat(nearest[i].home_lon, nearest[i].home_lat), near_icon.clone(), description);
     }
 


@@ -75,7 +75,7 @@
         removeMarkerFromMap(marker);
       }
 
         removeMarkerFromMap(marker);
       }
 

-      marker = addMarkerToMap(lonlat, null, "Your location");
+      marker = addMarkerToMap(lonlat, null, "<%= t 'user.friend_map.your location' %>");

     }
   }
 
     }
   }
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fa45d52766b9a762432c60e8f3dae72362fae6a4..42dafa74445e7ed508acc299e44fc9f6ca42ef10 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -142,3 +142,6 @@ en:
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings
       nearby users: "Nearby users: "
       no nearby users: "There are no users who admit to mapping nearby yet."
       change your settings: change your settings

+    friend_map:
+      your location: Your location
+      nearby mapper: "Nearby mapper: "