Databrowser i18n. The stuff in start.rjs is a bit bizarre and might need a second...

diff --git a/app/views/browse/_relation_member.rhtml b/app/views/browse/_relation_member.rhtml
index ce982e2db4cf12707986c94c0b7679ac1bc9946b..39b89bc0100681be236d477ec7df387bb325e580 100644 (file)
--- a/app/views/browse/_relation_member.rhtml
+++ b/app/views/browse/_relation_member.rhtml
@@ -3,7 +3,7 @@
     <%= relation_member.member_type.capitalize %>
     <%= link_to h(printable_name(relation_member.member)), :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s %>
     <% unless relation_member.member_role.blank? %>
-      as
+      <%= t'browse.relation_member.as' %>
       <%= h(relation_member.member_role) %>
     <% end %>
   </td>

diff --git a/app/views/browse/_start.rhtml b/app/views/browse/_start.rhtml
index 2e120c100e7024bef6392458eb3e675e2727c4a6..9a1d50a828c1a21e757db3be2db65a044f07ba77 100644 (file)
--- a/app/views/browse/_start.rhtml
+++ b/app/views/browse/_start.rhtml
@@ -1,9 +1,9 @@
 <div>
   <div style="text-align: center">
     <p style="margin-top: 10px; margin-bottom: 20px">
-      <a id="browse_select_view" href="#">View data for current map view</a>
+      <a id="browse_select_view" href="#"><%= t'browse.start.view_data' %></a>
       <br />
-      <a id="browse_select_box" href="#">Manually select a different area</a>  
+      <a id="browse_select_box" href="#"><%= t'browse.start.manually_select' %></a>  
     </p>
   </div>
   <div id="browse_status" style="text-align: center; display: none">

diff --git a/app/views/browse/relation.rhtml b/app/views/browse/relation.rhtml
index 89f826c17ed53b1dddca4b98b0199a29e836404e..e180da084377d05929c08380e088c501c79e8b2e 100644 (file)
--- a/app/views/browse/relation.rhtml
+++ b/app/views/browse/relation.rhtml
@@ -1,11 +1,11 @@
 <%
 @name = printable_name @relation
-@title = 'Relation | ' + @name
+@title = t('browse.relation.relation') + ' | ' + @name
 %>
 <table width="100%">
   <tr>
     <td>
-      <h2>Relation: <%= h(@name) %></h2>
+      <h2><%= t'browse.relation.relation_title', :relation_name => h(@name) %></h2>
     </td>
     <td>
       <%= render :partial => "navigation" %>
@@ -15,9 +15,8 @@
     <td>
       <%= render :partial => "relation_details", :object => @relation %>
       <hr />
-      <%= link_to "Download XML", :controller => "relation", :action => "read" %>
-      or
-      <%= link_to "view history", :action => "relation_history" %>
+      <%= t'browse.relation.download', :download_xml_link => link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read"),
+                                       :view_history_link => link_to(t('browse.relation.view_history'), :action => "relation_history") %>
     </td>
     <%= render :partial => "map", :object => @relation %>
   </tr>

diff --git a/app/views/browse/start.rjs b/app/views/browse/start.rjs
index 1cf423163f7e2b08ef274e7d5572226348bfe3f5..ccb39e4ff3e2793f282e825688ff49d4fc595edb 100644 (file)
--- a/app/views/browse/start.rjs
+++ b/app/views/browse/start.rjs
@@ -1,4 +1,4 @@
-page.replace_html :sidebar_title, 'Data'
+page.replace_html :sidebar_title, t('browse.start_rjs.data_frame_title')
 page.replace_html :sidebar_content, :partial => 'start'
 page << <<EOJ
   var browseBoxControl;
@@ -41,7 +41,7 @@ page << <<EOJ
       if (map.getZoom() >= 15) {
           useMap();
       } else {
-          setStatus("Zoom in or select an area of the map to view");
+          setStatus("#{I18n.t('browse.start_rjs.zoom_or_select')}");
       }    
     }
   }
@@ -76,7 +76,7 @@ page << <<EOJ
   }
 
   function startDrag() {
-    $("browse_select_box").innerHTML='Drag a box on the map to select an area';
+    $("browse_select_box").innerHTML='#{I18n.t('browse.start_rjs.drag_a_box')}';
 
     browseBoxControl.activate();
 
@@ -121,7 +121,7 @@ page << <<EOJ
 
     browseMode = "manual";  
 
-    $("browse_select_box").innerHTML = "Manually select a different area";
+    $("browse_select_box").innerHTML = "#{I18n.t('browse.start_rjs.manually_select')}";
     $("browse_select_view").style.display = "inline";
   }
 
@@ -131,12 +131,12 @@ page << <<EOJ
     var div = document.createElement("div");
 
     var p = document.createElement("p");
-    p.appendChild(document.createTextNode("You have loaded an area which contains " + browseFeatureList.length + " features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."));
+    p.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.loaded_an_area')} " + browseFeatureList.length + " #{I18n.t('browse.start_rjs.browsers')}"));
     div.appendChild(p);
 
     var input = document.createElement("input");
     input.type = "submit";
-    input.value = "Load Data";
+    input.value = "#{I18n.t('browse.start_rjs.load_data')}";
     input.onclick = loadFeatureList;
     div.appendChild(input); 
 
@@ -187,14 +187,14 @@ page << <<EOJ
     var size = projected.getWidth() * projected.getHeight();
 
     if (size > 0.25) {
-      setStatus("Unable to load: Bounding box size of " + size + " is too large (must be smaller than 0.25)");
+      setStatus("#{I18n.t('browse.start_rjs.unable_to_load')} " + size + " #{I18n.t('must_be_smaller')}");
     } else {
       loadGML("/api/#{API_VERSION}/map?bbox=" + projected.toBBOX());
     }
   }
 
   function loadGML(url) {
-    setStatus("Loading...");
+    setStatus("#{I18n.t('browse.start_rjs.loading')}");
     $("browse_content").innerHTML = "";
 
     if (!browseDataLayer) {
@@ -381,7 +381,7 @@ page << <<EOJ
         
     var link = document.createElement("a");   
     link.href =  "/browse/" + type + "/" + feature.osm_id + "/history";
-    link.appendChild(document.createTextNode("Show history"));
+    link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.show_history')}"));
     link.onclick = OpenLayers.Function.bind(loadHistory, {
       type: type, feature: feature, link: link
     });
@@ -394,7 +394,7 @@ page << <<EOJ
 
   function loadHistory() {
     this.link.href = "";
-    this.link.innerHTML = "Wait...";
+    this.link.innerHTML = "#{I18n.t('browse.start_rjs.wait')}";
 
     new Ajax.Request("/api/#{API_VERSION}/" + this.type + "/" + this.feature.osm_id + "/history", {
       onComplete: OpenLayers.Function.bind(displayHistory, this)
@@ -421,7 +421,7 @@ page << <<EOJ
     table.appendChild(tr);
 
     var heading = document.createElement("td");
-    heading.appendChild(document.createTextNode("History for " + featureName(this.feature)));
+    heading.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.history_for')} " + featureName(this.feature)));
     tr.appendChild(heading);
 
     var td = document.createElement("td");
@@ -430,7 +430,7 @@ page << <<EOJ
 
     var link = document.createElement("a");   
     link.href = "/browse/" + this.type + "/" + this.feature.osm_id + "/history";
-    link.appendChild(document.createTextNode("Details"));
+    link.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.details')}"));
     td.appendChild(link);
 
     var div = document.createElement("div");
@@ -439,10 +439,10 @@ page << <<EOJ
     var nodes = doc.getElementsByTagName(this.type);
     var history = document.createElement("ul");  
     for (var i = nodes.length - 1; i >= 0; i--) {
-      var user = nodes[i].getAttribute("user") || "private user";
+      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("Edited by " + user + " at " + timestamp));
+      item.appendChild(document.createTextNode("#{I18n.t('browse.start_rjs.edited_by')} " + user + " #{I18n.t('browse.start_rjs.at_timestamp')} " + timestamp));
       history.appendChild(item);
     }
     div.appendChild(history);

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 42b5a9c53b9aa21b41db7405fe9c442684982402..eb80d4416da6c5fb0f59e30e5be94e67ed903e2b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -56,6 +56,35 @@ en:
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: {{relation_name}}"
+    relation_member:
+      as: "as"
+    relation:
+      relation: "Relation"
+      relation_title: "Relation: {{relation_name}}"
+      download: "{{download_xml_link}} or {{view_history_link}}"
+      download_xml: "Download XML"
+      view_history: "view history"
+    start:
+      view_data: "View data for current map view"
+      manually_select: "Manually select a different area"
+    start_rjs:
+      data_frame_title: "Data"
+      zoom_or_select: "Zoom in or select an area of the map to view"
+      drag_a_box: "Drag a box on the map to select an area"
+      manually_select: "Manually select a different area"
+      loaded_an_area: "You have loaded an area which contains"
+      browsers: "features. In general, some browsers may not cope well with displaying this quanity of data. Generally, browsers work best at displaying less than 100 features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      load_data: "Load Data"
+      unable_to_load: "Unable to load: Bounding box size of"
+      must_be_smaller: "is too large (must be smaller than 0.25)"
+      loading: "Loading..."
+      show_history: "Show History"
+      wait: "Wait..."
+      history_for: "History for"
+      details: "Details"
+      private_user: "private user"
+      edited_by: "Edited by"
+      at_timestamp: "at"
   diary_entry:
     list:
       new: New Diary Entry