more translations, and this time with stuff in the locale file too

diff --git a/app/views/browse/_common_details.rhtml b/app/views/browse/_common_details.rhtml
index 09cf4cf2da24cf66cc5b9d48aa879f92942a02b5..179b22f60813add46ec6a752d627e7bc404b46e9 100644 (file)
--- a/app/views/browse/_common_details.rhtml
+++ b/app/views/browse/_common_details.rhtml
@@ -1,22 +1,22 @@
 <tr>
 <tr>

-  <th>Edited at:</th>
-  <td><%= h(common_details.timestamp) %></td>
+  <th><%= t 'browse.common_details.edited_at' %></th>
+  <td><%= l common_details.timestamp %></td>

 </tr>
 
 <% if common_details.changeset.user.data_public? %>
   <tr>
 </tr>
 
 <% if common_details.changeset.user.data_public? %>
   <tr>

-    <th>Edited by:</th>
+    <th><%= t 'browse.common_details.edited_by' %></th>

     <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
   </tr>
 <% end %>
 
 <tr>
     <td><%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %></td>
   </tr>
 <% end %>
 
 <tr>

-  <th>Version:</th>
+  <th><%= t 'browse.common_details.version' %></th>

   <td><%= h(common_details.version) %></td>
 </tr>
 
 <tr>
   <td><%= h(common_details.version) %></td>
 </tr>
 
 <tr>

-  <th>In changeset:</th>
+  <th><%= t 'browse.common_details.in_changeset' %></th>

   <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td>
 </tr>
 
   <td><%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %></td>
 </tr>
 

diff --git a/app/views/browse/_containing_relation.rhtml b/app/views/browse/_containing_relation.rhtml
index f5317f0453f97f473c85719e56c92b1ad0fcb71e..ee704acc87cd52e48db190fc7cce453e5d5e295f 100644 (file)
--- a/app/views/browse/_containing_relation.rhtml
+++ b/app/views/browse/_containing_relation.rhtml
@@ -1,8 +1,8 @@
 <tr>
   <td>
 <tr>
   <td>

-    <%= link_to "Relation " + h(printable_name(containing_relation.relation)), :action => "relation", :id => containing_relation.relation.id.to_s %>
+    <%= link_to t('browse.containing_relation.relation', :relation_name => h(printable_name(containing_relation.relation))), :action => "relation", :id => containing_relation.relation.id.to_s %>

     <% unless containing_relation.member_role.blank? %>
     <% unless containing_relation.member_role.blank? %>

-      (as <%= h(containing_relation.member_role) %>)
+      <%= t 'browse.containing_relation.relation_as', :relation_role => h(containing_relation.member_role) %>

     <% end %>
   </td>
 </tr>
     <% end %>
   </td>
 </tr>

diff --git a/app/views/browse/_map.rhtml b/app/views/browse/_map.rhtml
index d972104ba9d9c40cf08f5928575ca2e72766d09b..6655afcc54db39a8d5c8ec2c528be6c7f85b9498 100644 (file)
--- a/app/views/browse/_map.rhtml
+++ b/app/views/browse/_map.rhtml
@@ -5,10 +5,10 @@
   <% if map.instance_of? Changeset or map.visible %>
     <div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
     </div>
   <% if map.instance_of? Changeset or map.visible %>
     <div id="small_map" style="width:250px; height: 300px; border: solid 1px black">
     </div>

-    <span id="loading">Loading...</span>
+    <span id="loading"><%= t 'browse.map.loading' %></span>

     <a id="larger_map" href=""></a>
   <% else %>
     <a id="larger_map" href=""></a>
   <% else %>

-    Deleted
+    <%= t 'browse.map.deleted' %>

   <% end %>
 </td>
 <script type="text/javascript">
   <% end %>
 </td>
 <script type="text/javascript">


@@ -30,7 +30,7 @@
     $("loading").innerHTML = "";
 
     $("larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';
     $("loading").innerHTML = "";
 
     $("larger_map").href = '/?minlon='+minlon+'&minlat='+minlat+'&maxlon='+maxlon+'&maxlat='+maxlat+'&box=yes';

-    $("larger_map").innerHTML = "View Larger Map";
+    $("larger_map").innerHTML = "<%= t 'browse.map.view_larger_map' %>";

     <% else %>
     var obj_type = "<%= map.class.name.downcase %>";
     var obj_id = <%= map.id %>;
     <% else %>
     var obj_type = "<%= map.class.name.downcase %>";
     var obj_id = <%= map.id %>;


@@ -63,7 +63,7 @@
 
        var center = getMapCenter();
         $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();
 
        var center = getMapCenter();
         $("larger_map").href = '/?lat='+center.lat+'&lon='+center.lon+'&zoom='+this.map.getZoom();

-        $("larger_map").innerHTML = "View Larger Map";
+        $("larger_map").innerHTML = "<%= t 'browse.map.view_larger_map' %>";

       } else {
         $("small_map").style.display = "none";
       }
       } else {
         $("small_map").style.display = "none";
       }

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a750b13c9844272cffa430515f0b43a4a1ce7247..1cd7fc8efc9bdb262bfe91ffc33ab698bfd2c66c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,35 @@ en:
     view: View
     edit: Edit
     coordinates: "Coordinates:"
     view: View
     edit: Edit
     coordinates: "Coordinates:"

+  browse:
+    changeset:
+      changeset: "Changeset:"
+      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+      changesetxml: "Changeset XML"
+      osmchangexml: "osmChange XML"
+    changeset_details:
+      created_at: "Created at:"
+      closed_at: "Closed at:"
+      belongs_to: "Belongs to:"
+      bounding_box: "Bounding box:"
+      no_bounding_box: "No bounding box has been stored for this changeset."
+      show_area_box: "Show Area Box"
+      box: "box"
+      has_nodes: "Has the following {{node_count}} nodes:"
+      has_ways: "Has the following {{way_count}} ways:"
+      has_relations: "Has the following {{relation_count}} relations:"
+    common_details: 
+      edited_at: "Edited at:"
+      edited_by: "Edited by:"
+      version: "Version:"
+      in_changeset: "In changeset:"
+    containing_relation:
+      relation: "Relation {{relation_name}}"
+      relation_as: "(as {{relation_role}})"
+    map:
+      loading: "Loading..."
+      deleted: "Deleted"
+      view_larger_map: "View Larger Map"

   diary_entry:
     list:
       new: New Diary Entry
   diary_entry:
     list:
       new: New Diary Entry