Merged I18N branch to head.

[rails.git] / app / views / user / _friend_map.rhtml

diff --git a/app/views/user/_friend_map.rhtml b/app/views/user/_friend_map.rhtml
index fd86ab10c37187c96f2828ebba680d220e537359..c6d5f8afe498c776857590c4deab81c67572434d 100644 (file)
--- a/app/views/user/_friend_map.rhtml
+++ b/app/views/user/_friend_map.rhtml
@@ -45,18 +45,20 @@
     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);
     }
 

-    map.events.register("click", map, setHome);
+    if (document.getElementById('updatehome')) {
+      map.events.register("click", map, setHome);
+    }

   }        
 
   function setHome( e ) { 
   }        
 
   function setHome( e ) { 


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

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

     }
   }
 
     }
   }