X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6baccfaddd190d730b626204e9cf81c2504995bf..6f0229bb53680a3634c138381197692d643ce98d:/public/javascripts/site.js?ds=inline

diff --git a/public/javascripts/site.js b/public/javascripts/site.js
index b7ad7d7e4..43cca261c 100644
--- a/public/javascripts/site.js
+++ b/public/javascripts/site.js
@@ -1,3 +1,4 @@
+
 /*
  * Called as the user scrolls/zooms around to aniplate hrefs of the
  * view tab and various other links
@@ -55,14 +56,17 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
       args.lat = lat;
       args.lon = lon;
       args.zoom = zoom;
+      if (objtype && objid) {
+        args[objtype] = objid;
+      }
       node.href = setArgs("/edit", args);
       node.style.fontStyle = 'normal';
     } else {
-      node.href = 'javascript:alert("zoom in to edit map");';
+      node.href = 'javascript:alert(i18n("javascripts.site.edit_zoom_alert"));';
       node.style.fontStyle = 'italic';
     }
   }
-  
+
   node = document.getElementById("historyanchor");
   if (node) {
     if (zoom >= 11) {
@@ -72,18 +76,18 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
 	  typeof minlat == "number" &&
 	  typeof maxlon == "number" &&
 	  typeof maxlat == "number") {
-      
+
         minlon = Math.round(minlon * decimals) / decimals;
         minlat = Math.round(minlat * decimals) / decimals;
         maxlon = Math.round(maxlon * decimals) / decimals;
         maxlat = Math.round(maxlat * decimals) / decimals;
         args.bbox = minlon + "," + minlat + "," + maxlon + "," + maxlat;
       }
-      
+
       node.href = setArgs("/history", args);
       node.style.fontStyle = 'normal';
     } else {
-      node.href = 'javascript:alert("zoom in to see editing history");';
+      node.href = 'javascript:alert(i18n("javascripts.site.history_zoom_alert"));';
       node.style.fontStyle = 'italic';
     }
   }
@@ -105,6 +109,9 @@ function updatelinks(lon,lat,zoom,layers,minlon,minlat,maxlon,maxlat,objtype,obj
     if (layers && (layers != "B000FTF") && (layers != "B000FTFT")) {
       args["layers"] = layers;
     }
+    else {
+      delete args["layers"];
+    }
 
     // Here we're assuming that all parameters but ?layers= and
     // ?{node,way,relation}= can be safely omitted from the shortlink
@@ -125,7 +132,7 @@ function shortlinkPrefix() {
   if (window.location.hostname.match(/^www\.openstreetmap\.org/i)) {
     return "http://osm.org";
   } else {
-    return "";     
+    return "";
   }
 }
 
@@ -195,15 +202,17 @@ function getStyle(el, property) {
  * rails and then later by javascript.
  */
 function i18n(string, keys) {
+  string = i18n_strings[string] || string
+
   for (var key in keys) {
     var re_key = '\\[\\[' + key + '\\]\\]';
     var re = new RegExp(re_key, "g");
-      
+
     string = string.replace(re, keys[key]);
   }
-   
+
   return string;
-} 
+}
 
 function makeShortCode(lat, lon, zoom) {
     char_array = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_@";
@@ -231,7 +240,7 @@ function makeShortCode(lat, lon, zoom) {
 	str += char_array.charAt(digit);
     }
     for (var i = 0; i < ((zoom + 8) % 3); ++i) {
-	str += "=";
+	str += "-";
     }
     return str;
 }