Merge 17067 from trunk.

[rails.git] / app / views / browse / start.rjs

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index ccb39e4ff3e2793f282e825688ff49d4fc595edb..220295663f8c9753e083c3738e504ba05f0c9798 100644 (file)
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -76,7 +76,7 @@ page << <<EOJ
   }
 
   function startDrag() {
   }
 
   function startDrag() {

-    $("browse_select_box").innerHTML='#{I18n.t('browse.start_rjs.drag_a_box')}';
+    $("browse_select_box").innerHTML="#{I18n.t('browse.start_rjs.drag_a_box')}";

 
     browseBoxControl.activate();
 
 
     browseBoxControl.activate();
 


@@ -131,7 +131,7 @@ page << <<EOJ
     var div = document.createElement("div");
 
     var p = document.createElement("p");
     var div = document.createElement("div");
 
     var p = document.createElement("p");

-    p.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.loaded_an_area')} " + browseFeatureList.length + " #{I18n.t('browse.start_rjs.browsers')}"));
+    p.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.loaded_an_area_with_num_features')}", { num_features: browseFeatureList.length })));

     div.appendChild(p);
 
     var input = document.createElement("input");
     div.appendChild(p);
 
     var input = document.createElement("input");


@@ -186,8 +186,8 @@ page << <<EOJ
     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 
     var projected = bounds.clone().transform(new OpenLayers.Projection("EPSG:900913"), new OpenLayers.Projection("EPSG:4326"));
     var size = projected.getWidth() * projected.getHeight();
 

-    if (size > 0.25) {
-      setStatus("#{I18n.t('browse.start_rjs.unable_to_load')} " + size + " #{I18n.t('must_be_smaller')}");
+    if (size > #{APP_CONFIG['max_request_area']}) {
+      setStatus(i18n("#{I18n.t('browse.start_rjs.unable_to_load_size', :max_bbox_size => APP_CONFIG['max_request_area'])}", { bbox_size: size }));

     } else {
       loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
     }
     } else {
       loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
     }


@@ -245,7 +245,7 @@ page << <<EOJ
 
       var heading = document.createElement("p");
       heading.className = "browse_heading";
 
       var heading = document.createElement("p");
       heading.className = "browse_heading";

-      heading.appendChild(document.createTextNode("Object list"));
+      heading.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.heading')}"));

       browseObjectList.appendChild(heading);
 
       var list = document.createElement("ul");
       browseObjectList.appendChild(heading);
 
       var list = document.createElement("ul");


@@ -255,14 +255,14 @@ page << <<EOJ
             
         // Type, for linking
         var type = featureType(feature);
             
         // Type, for linking
         var type = featureType(feature);

-        var typeName = ucFirst(type);
+        var typeName = featureTypeName(feature);

         var li = document.createElement("li");
         li.appendChild(document.createTextNode(typeName + " "));
             
         // Link, for viewing in the tab
         var link = document.createElement("a");
         link.href =  "/browse/" + type + "/" + feature.osm_id; 
         var li = document.createElement("li");
         li.appendChild(document.createTextNode(typeName + " "));
             
         // Link, for viewing in the tab
         var link = document.createElement("a");
         link.href =  "/browse/" + type + "/" + feature.osm_id; 

-        var name = feature.attributes.name || feature.osm_id;
+        var name = featureName(feature);

         link.appendChild(document.createTextNode(name));
         link.feature = feature;
         link.onclick = OpenLayers.Function.bind(viewFeatureLink, link);   
         link.appendChild(document.createTextNode(name));
         link.feature = feature;
         link.onclick = OpenLayers.Function.bind(viewFeatureLink, link);   


@@ -275,7 +275,7 @@ page << <<EOJ
 
       var link = document.createElement("a");
       link.href = this.url;
 
       var link = document.createElement("a");
       link.href = this.url;

-      link.appendChild(document.createTextNode("API"));
+      link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.api')}"));

       browseObjectList.appendChild(link);
 
       $("browse_content").innerHTML = "";
       browseObjectList.appendChild(link);
 
       $("browse_content").innerHTML = "";


@@ -336,7 +336,7 @@ page << <<EOJ
     var link = document.createElement("a");
     link.href = "#";
     link.onclick = loadObjectList;
     var link = document.createElement("a");
     link.href = "#";
     link.onclick = loadObjectList;

-    link.appendChild(document.createTextNode("Display object list"));
+    link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.back')}"));

     div.appendChild(link);
 
     var table = document.createElement("table");
     div.appendChild(link);
 
     var table = document.createElement("table");


@@ -348,7 +348,7 @@ page << <<EOJ
     table.appendChild(tr);
 
     var heading = document.createElement("td");
     table.appendChild(tr);
 
     var heading = document.createElement("td");

-    heading.appendChild(document.createTextNode(featureName(feature)));
+    heading.appendChild(document.createTextNode(featureNameSelect(feature)));

     tr.appendChild(heading);
 
     var td = document.createElement("td");
     tr.appendChild(heading);
 
     var td = document.createElement("td");


@@ -358,7 +358,7 @@ page << <<EOJ
     var type = featureType(feature);
     var link = document.createElement("a");   
     link.href = "/browse/" + type + "/" + feature.osm_id;
     var type = featureType(feature);
     var link = document.createElement("a");   
     link.href = "/browse/" + type + "/" + feature.osm_id;

-    link.appendChild(document.createTextNode("Details"));
+    link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.object_list.details')}"));

     td.appendChild(link);
 
     var div = document.createElement("div");
     td.appendChild(link);
 
     var div = document.createElement("div");


@@ -421,7 +421,7 @@ page << <<EOJ
     table.appendChild(tr);
 
     var heading = document.createElement("td");
     table.appendChild(tr);
 
     var heading = document.createElement("td");

-    heading.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.history_for')} " + featureName(this.feature)));
+    heading.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.history_for_feature')}", { feature: featureNameHistory(this.feature) })));

     tr.appendChild(heading);
 
     var td = document.createElement("td");
     tr.appendChild(heading);
 
     var td = document.createElement("td");


@@ -442,7 +442,7 @@ page << <<EOJ
       var user = nodes[i].getAttribute("user") || "#{I18n.t('browse.start_rjs.private_user')}";
       var timestamp = nodes[i].getAttribute("timestamp");
       var item = document.createElement("li");
       var user = nodes[i].getAttribute("user") || "#{I18n.t('browse.start_rjs.private_user')}";
       var timestamp = nodes[i].getAttribute("timestamp");
       var item = document.createElement("li");

-      item.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.edited_by')} " + user + " #{I18n.t('browse.start_rjs.at_timestamp')} " + timestamp));
+      item.appendChild(document.createTextNode(i18n("#{I18n.t('browse.start_rjs.edited_by_user_at_timestamp')}", { user: user, timestamp: timestamp })));

       history.appendChild(item);
     }
     div.appendChild(history);
       history.appendChild(item);
     }
     div.appendChild(history);


@@ -457,12 +457,46 @@ page << <<EOJ
       return "way";
     }
   }
       return "way";
     }
   }

-  
+
+  function featureTypeName(feature) {
+    if (featureType(feature) == "node") {
+      return "#{I18n.t('browse.start_rjs.object_list.type.node')}";
+    } else if (featureType(feature) == "way") {
+      return "#{I18n.t('browse.start_rjs.object_list.type.way')}";
+    }
+  }
+

   function featureName(feature) {
   function featureName(feature) {

-    if (feature.attributes.name) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {

       return feature.attributes.name;
     } else {
       return feature.attributes.name;
     } else {

-      return ucFirst(featureType(feature)) + " " + feature.osm_id;
+      return feature.osm_id;
+    }
+  }
+
+  function featureNameSelect(feature) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {
+      return feature.attributes.name;
+    } else if (featureType(feature) == "node") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.node')}", { id: feature.osm_id });
+    } else if (featureType(feature) == "way") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.selected.type.way')}", { id: feature.osm_id });
+    }
+  }
+
+  function featureNameHistory(feature) {
+    if (feature.attributes['name:#{I18n.locale}']) {
+      return feature.attributes['name:#{I18n.locale}'];
+    } else if (feature.attributes.name) {
+      return feature.attributes.name;
+    } else if (featureType(feature) == "node") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.node')}", { id: feature.osm_id });
+    } else if (featureType(feature) == "way") {
+      return i18n("#{I18n.t('browse.start_rjs.object_list.history.type.way')}", { id: feature.osm_id });

     }
   }
 
     }
   }
 


@@ -476,9 +510,5 @@ page << <<EOJ
     $("browse_status").style.display = "none";
   }
 
     $("browse_status").style.display = "none";
   }
 

-  function ucFirst(str) {
-    return str.substr(0,1).toUpperCase() + str.substr(1,str.length);
-  }
-

   startBrowse();
 EOJ
   startBrowse();
 EOJ