i18n of the changeset views

diff --git a/app/views/changeset/_changeset.rhtml b/app/views/changeset/_changeset.rhtml
index 2a53564507f894e8b0918cb2fbdf950ffc7669cd..ae7a495c283d30e1a612595f7e3b18417cef77fe 100644 (file)
--- a/app/views/changeset/_changeset.rhtml
+++ b/app/views/changeset/_changeset.rhtml
@@ -6,7 +6,7 @@
   </td>
 
   <td class="<%= cl %>">
-    <% if changeset.closed_at > DateTime.now %> (still editing)
+    <% if changeset.closed_at > DateTime.now %> <%= t'changeset.changeset.still_editing' %>
     <% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
   </td>
 
@@ -16,7 +16,7 @@
     <% if changeset.user.data_public? %>
       <%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list_user", :display_name => changeset.user.display_name %>
     <% else %>
-      <i>Anonymous</i>
+      <i><%= t'changeset.changeset.anonymous' %></i>
     <% end %>
     </td>
   <% end %>
@@ -25,23 +25,23 @@
     <% if changeset.tags['comment'] %>
       <%= h(changeset.tags['comment']) %>
     <% else %>
-      (none)
+      <%= t'changeset.changeset.no_comment' %>
     <% end %>
   </td>
 
   <td class="<%= cl %>">
     <% if changeset.min_lat.nil? %>
-      (no edits)
+      <%= t'changeset.changeset.no_edits' %>
     <% else 
       minlon = changeset.min_lon/GeoRecord::SCALE.to_f
       minlat = changeset.min_lat/GeoRecord::SCALE.to_f
       maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
       maxlat = changeset.max_lat/GeoRecord::SCALE.to_f
     %>
-      <a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>
+      <a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t'changeset.changset.show_area_box' %>'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>
       <!--<%=changeset.area%>-->
     <%   if changeset.area > 1500000000000 %>
-      (big)
+      <% t'changeset.changeset.big_area' %>
     <%
          end
        end
@@ -49,7 +49,7 @@
   </td>
 
   <td class="<%= cl %>">
-    <%= link_to 'more', {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => 'View changeset details'} %> 
+    <%= link_to t('changeset.changeset.more'), {:controller => 'browse', :action => 'changeset', :id => changeset.id}, {:title => t('changeset.changeset.view_changeset_details')} %> 
   </td>
 
 </tr>

diff --git a/app/views/changeset/_changeset_paging_nav.rhtml b/app/views/changeset/_changeset_paging_nav.rhtml
index 7be15305df77a462b992731bd8c1c973992ff459..b8ac1a65fca39f394c5aaf7762ed9e3013535437 100644 (file)
--- a/app/views/changeset/_changeset_paging_nav.rhtml
+++ b/app/views/changeset/_changeset_paging_nav.rhtml
@@ -1,11 +1,11 @@
 <% current_page = @edit_pages.current_page %>
 
-Showing page 
+<%= t'changeset.changeset_paging_nav.showing_page' %> 
 <%= current_page.number %> (<%= current_page.first_item %><% 
 if (current_page.first_item < current_page.last_item) # if more than 1 changeset on page 
   %>-<%= current_page.last_item %><% 
 end %>
-of <%= @edit_pages.item_count %>)
+<%= t'changeset.changeset_paging_nav.of'%> <%= @edit_pages.item_count %>)
 
 <%
 if @edit_pages.page_count > 1 

diff --git a/app/views/changeset/_changesets.rhtml b/app/views/changeset/_changesets.rhtml
index 67e09045dc3beaa7c3603f37efbd15388a44b927..d9e01235c215d419375c9c36fbca051fe304950b 100644 (file)
--- a/app/views/changeset/_changesets.rhtml
+++ b/app/views/changeset/_changesets.rhtml
@@ -1,14 +1,14 @@
 <% showusername = true if showusername.nil? %>
 <table id="changeset_list" cellpadding="3">
   <tr>
-    <th>ID</th>
-    <th>Saved at</th>
+    <th><%= t'changeset.changesets.id' %></th>
+    <th><%= t'changeset.changesets.saved_at' %></th>
 <% if showusername %>
-    <th>User</th>
+    <th><%= t'changeset.changesets.user' %></th>
 <% end %>
-    <th>Comment</th>
-    <th>Area</th>
+    <th><%= t'changeset.changesets.comment' %></th>
+    <th><%= t'changeset.changesets.area' %></th>
     <th></th>
   </tr>
   <%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %>
-</table>
\ No newline at end of file
+</table>

diff --git a/app/views/changeset/list.rhtml b/app/views/changeset/list.rhtml
index b78469ddfc8b2ab7cf4080fbd5765949071c1c94..cfe4afd3faa5d0d9de765505f5a797220a3202ec 100644 (file)
--- a/app/views/changeset/list.rhtml
+++ b/app/views/changeset/list.rhtml
@@ -1,9 +1,7 @@
-<h1>Recent Changes</h1>
-<p>Recently edited changesets:</p>
+<h1><%= t'changeset.list.recent_changes' %></h1>
+<p><%= t'changeset.list.recently_edited_changesets' %></p>
 
 <%= render :partial => 'changesets' %>
 
-<p>
-For more changesets, select a user and view their edits, or see the editing 'history' of a specific area.
-</p>
+<p><%= t'changeset.list.for_more_changesets' %></p>
 <br>

diff --git a/app/views/changeset/list_bbox.rhtml b/app/views/changeset/list_bbox.rhtml
index 34644e960b471ae55075c48578bd5d3acf5ff360..530b5a29642e856582203dde796eb9724051a629 100644 (file)
--- a/app/views/changeset/list_bbox.rhtml
+++ b/app/views/changeset/list_bbox.rhtml
@@ -1,4 +1,4 @@
-<h1>History</h1>
+<h1><%= t'changeset.list_bbox.history' %></h1>
 <%
 if @bbox!=nil
        minlon = @bbox[0] 
@@ -8,20 +8,20 @@ if @bbox!=nil
 
        %>
 <p>
-Changesets within the area: 
-      (<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='show area box'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>) 
+<%= t'changeset.list_bbox.changesets.within_the_area' %> 
+      (<a href='/?minlon=<%= minlon %>&minlat=<%= minlat %>&maxlon=<%= maxlon %>&maxlat=<%= maxlat %>&box=yes' title='<%= t'changeset.list_bbox.show_area_box' %>'><%= format("%0.3f",minlon) -%>,<%= format("%0.3f",minlat) -%>,<%= format("%0.3f",maxlon) -%>,<%= format("%0.3f",maxlat) -%></a>) 
 
 </p>
 
 <%     if @edits.nil? or @edits.empty? %>
-<p><b>No changesets</b></p>
+<p><b><%= t'changeset.list_bbox.no_changesets' %></b></p>
 <%     else %>
 
 <%= render :partial => 'changeset_paging_nav' %>
 <%= render :partial => 'changesets' %>
 <%= render :partial => 'changeset_paging_nav' %>
 
-<p>For all changes everywhere see <%=  link_to("Recent Changes", :controller => "browse", :action => "changesets") %> </p>
+<p><%= t'changeset.list_bbox.all_changes_everywhere' , :recent_changes_link => link_to(t('changest.list_bbox.recent_changes'), :controller => "browse", :action => "changesets") %> </p>
 
 <%
        end
@@ -30,9 +30,9 @@ else
        #bbox is nil. happens if the user surfs to this page directly.
 %>
 
-<p>No area specified</p>
-<p>First use the <a href="/" title="view the map">view tab</a> to pan and zoom to an area of interest, then click the history tab.</p>
-<p>Alternatively view all <%=  link_to("recent changes", :controller => "browse", :action => "changesets") %> </p>
+<p><%= t'changeset.list_bbox.no_area_specified' %></p>
+<p><%= t'changeset.list_bbox.first_use_view', :view_tab_link => '<a href="/" title="' + t('changeset.list_bbox.view_the_map') + '">' + t('changeset.list_bbox.view_tab') + '</a>' %></p>
+<p><%= t'changeset.list_bbox.alternatively_view', :recent_changes_link => link_to(t('changeset.list_bbox.recent_changes'), :controller => "browse", :action => "changesets") %></p>
 
 <%
 end

diff --git a/app/views/changeset/list_user.rhtml b/app/views/changeset/list_user.rhtml
index cf99d7a48fafaa46d7648c4508b3100447166240..7240e60276412a27d073a822c12ce2876be99f0a 100644 (file)
--- a/app/views/changeset/list_user.rhtml
+++ b/app/views/changeset/list_user.rhtml
@@ -1,13 +1,13 @@
-<h1>Edits by <%= link_to(h(@display_name), {:controller=>'user', :action=>'view', :display_name=>@display_name}) %></h1>
+<h1><%= t'changeset.list_user.edits_by_username', :username_link => link_to(h(@display_name), {:controller=>'user', :action=>'view', :display_name=>@display_name}) %></h1>
 
 <% if not @edits or @edits.empty? %>
-<p><b>No visible edits by <%= h(@display_name) %>.</b></p>
+<p><b><%= t'changeset.list_user.no_visible_edits_by', :name => h(@display_name) %>.</b></p>
 <% else %>
 <%= render :partial => 'changeset_paging_nav' %>
 <%= render :partial => 'changesets', :locals => {:showusername => false} %>
 <%= render :partial => 'changeset_paging_nav' %>
 <% end %>
 
-<p>For changes by all users see <%=  link_to("Recent Changes", :controller => "browse", :action => "changesets") %> </p>
+<p><%= t'changeset.list_user.for_all_changes', :recent_changes_link => link_to(t('changeset.list_user.recent_changes'), :controller => "browse", :action => "changesets") %></p>
 <br>
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index ab290327cf8fc56baedb895bf05789722162b43b..5380f3fdcb855e439dcfb69e75a6330daf17192e 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -102,6 +102,46 @@ en:
       download: "{{download_xml_link}} or {{view_history_link}}"
       download_xml: "Download XML"
       view_history: "view history"
+  changeset:
+    changeset_paging_nav: 
+      showing_page: "Showing page"
+      of: "of"
+    changeset:
+      still_editing: "(still editing)"
+      anonymous: "Anonymous"
+      no_comment: "(none)"
+      no_edits: "(no edits)"
+      show_area_box: "show area box"
+      big_area: "(big)"
+      view_changeset_details: "View changeset details"
+      more: "more"
+    changesets:
+      id: "ID"
+      saved_at: "Saved at"
+      user: "User"
+      comment: "Comment"
+      area: "Area"
+    list_bbox:
+      history: "History"
+      changesets_within_the_area: "Changesets within the area:"
+      show_area_box: "show area box"
+      no_changesets: "No changesets"
+      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"
+      no_area_specified: "No area specified"
+      first_use_view: "First use the {{view_tab_link}} to pan and zoom to an area of interest, then click the history tab."
+      view_the_map: "view the map"
+      view_tab: "view tab"
+      alternatively_view: "Alternatively, view all {{recent_changes_link}}"
+    list:
+      recent_changes: "Recent Changes"
+      recently_edited_changesets: "Recently edited changesets:"
+      for_more_changesets: "For more changesets, select a user and view their edits, or see the editing 'history' of a specific area."
+    list_user:
+      edits_by_username: "Edits by {{username_link}}"
+      no_visible_edits_by: "No visible edits by {{name}}."
+      for_all_changes: "For changes by all users see {{recent_changes_link}}"
+      recent_changes: "Recent Changes"
   diary_entry:
     list:
       new: New Diary Entry