i18n of the changeset views
This commit is contained in:
parent
b22ae71613
commit
fddda4efa6
7 changed files with 69 additions and 31 deletions
|
@ -6,7 +6,7 @@
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="<%= cl %>">
|
<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 %>
|
<% else %><%= changeset.closed_at.strftime("%d %b %Y %H:%M") %><% end %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
||||||
<% if changeset.user.data_public? %>
|
<% if changeset.user.data_public? %>
|
||||||
<%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list_user", :display_name => changeset.user.display_name %>
|
<%= link_to h(changeset.user.display_name), :controller => "changeset", :action => "list_user", :display_name => changeset.user.display_name %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<i>Anonymous</i>
|
<i><%= t'changeset.changeset.anonymous' %></i>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -25,23 +25,23 @@
|
||||||
<% if changeset.tags['comment'] %>
|
<% if changeset.tags['comment'] %>
|
||||||
<%= h(changeset.tags['comment']) %>
|
<%= h(changeset.tags['comment']) %>
|
||||||
<% else %>
|
<% else %>
|
||||||
(none)
|
<%= t'changeset.changeset.no_comment' %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="<%= cl %>">
|
<td class="<%= cl %>">
|
||||||
<% if changeset.min_lat.nil? %>
|
<% if changeset.min_lat.nil? %>
|
||||||
(no edits)
|
<%= t'changeset.changeset.no_edits' %>
|
||||||
<% else
|
<% else
|
||||||
minlon = changeset.min_lon/GeoRecord::SCALE.to_f
|
minlon = changeset.min_lon/GeoRecord::SCALE.to_f
|
||||||
minlat = changeset.min_lat/GeoRecord::SCALE.to_f
|
minlat = changeset.min_lat/GeoRecord::SCALE.to_f
|
||||||
maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
|
maxlon = changeset.max_lon/GeoRecord::SCALE.to_f
|
||||||
maxlat = changeset.max_lat/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%>-->
|
<!--<%=changeset.area%>-->
|
||||||
<% if changeset.area > 1500000000000 %>
|
<% if changeset.area > 1500000000000 %>
|
||||||
(big)
|
<% t'changeset.changeset.big_area' %>
|
||||||
<%
|
<%
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -49,7 +49,7 @@
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
<td class="<%= cl %>">
|
<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>
|
</td>
|
||||||
|
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
<% current_page = @edit_pages.current_page %>
|
<% current_page = @edit_pages.current_page %>
|
||||||
|
|
||||||
Showing page
|
<%= t'changeset.changeset_paging_nav.showing_page' %>
|
||||||
<%= current_page.number %> (<%= current_page.first_item %><%
|
<%= current_page.number %> (<%= current_page.first_item %><%
|
||||||
if (current_page.first_item < current_page.last_item) # if more than 1 changeset on page
|
if (current_page.first_item < current_page.last_item) # if more than 1 changeset on page
|
||||||
%>-<%= current_page.last_item %><%
|
%>-<%= current_page.last_item %><%
|
||||||
end %>
|
end %>
|
||||||
of <%= @edit_pages.item_count %>)
|
<%= t'changeset.changeset_paging_nav.of'%> <%= @edit_pages.item_count %>)
|
||||||
|
|
||||||
<%
|
<%
|
||||||
if @edit_pages.page_count > 1
|
if @edit_pages.page_count > 1
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
<% showusername = true if showusername.nil? %>
|
<% showusername = true if showusername.nil? %>
|
||||||
<table id="changeset_list" cellpadding="3">
|
<table id="changeset_list" cellpadding="3">
|
||||||
<tr>
|
<tr>
|
||||||
<th>ID</th>
|
<th><%= t'changeset.changesets.id' %></th>
|
||||||
<th>Saved at</th>
|
<th><%= t'changeset.changesets.saved_at' %></th>
|
||||||
<% if showusername %>
|
<% if showusername %>
|
||||||
<th>User</th>
|
<th><%= t'changeset.changesets.user' %></th>
|
||||||
<% end %>
|
<% end %>
|
||||||
<th>Comment</th>
|
<th><%= t'changeset.changesets.comment' %></th>
|
||||||
<th>Area</th>
|
<th><%= t'changeset.changesets.area' %></th>
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
<%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %>
|
<%= render :partial => 'changeset', :locals => {:showusername => showusername}, :collection => @edits unless @edits.nil? %>
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
<h1>Recent Changes</h1>
|
<h1><%= t'changeset.list.recent_changes' %></h1>
|
||||||
<p>Recently edited changesets:</p>
|
<p><%= t'changeset.list.recently_edited_changesets' %></p>
|
||||||
|
|
||||||
<%= render :partial => 'changesets' %>
|
<%= render :partial => 'changesets' %>
|
||||||
|
|
||||||
<p>
|
<p><%= t'changeset.list.for_more_changesets' %></p>
|
||||||
For more changesets, select a user and view their edits, or see the editing 'history' of a specific area.
|
|
||||||
</p>
|
|
||||||
<br>
|
<br>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
<h1>History</h1>
|
<h1><%= t'changeset.list_bbox.history' %></h1>
|
||||||
<%
|
<%
|
||||||
if @bbox!=nil
|
if @bbox!=nil
|
||||||
minlon = @bbox[0]
|
minlon = @bbox[0]
|
||||||
|
@ -8,20 +8,20 @@ if @bbox!=nil
|
||||||
|
|
||||||
%>
|
%>
|
||||||
<p>
|
<p>
|
||||||
Changesets within the area:
|
<%= t'changeset.list_bbox.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>)
|
(<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>
|
</p>
|
||||||
|
|
||||||
<% if @edits.nil? or @edits.empty? %>
|
<% if @edits.nil? or @edits.empty? %>
|
||||||
<p><b>No changesets</b></p>
|
<p><b><%= t'changeset.list_bbox.no_changesets' %></b></p>
|
||||||
<% else %>
|
<% else %>
|
||||||
|
|
||||||
<%= render :partial => 'changeset_paging_nav' %>
|
<%= render :partial => 'changeset_paging_nav' %>
|
||||||
<%= render :partial => 'changesets' %>
|
<%= render :partial => 'changesets' %>
|
||||||
<%= render :partial => 'changeset_paging_nav' %>
|
<%= 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
|
end
|
||||||
|
@ -30,9 +30,9 @@ else
|
||||||
#bbox is nil. happens if the user surfs to this page directly.
|
#bbox is nil. happens if the user surfs to this page directly.
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<p>No area specified</p>
|
<p><%= t'changeset.list_bbox.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><%= 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>Alternatively view all <%= link_to("recent changes", :controller => "browse", :action => "changesets") %> </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
|
end
|
||||||
|
|
|
@ -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? %>
|
<% 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 %>
|
<% else %>
|
||||||
<%= render :partial => 'changeset_paging_nav' %>
|
<%= render :partial => 'changeset_paging_nav' %>
|
||||||
<%= render :partial => 'changesets', :locals => {:showusername => false} %>
|
<%= render :partial => 'changesets', :locals => {:showusername => false} %>
|
||||||
<%= render :partial => 'changeset_paging_nav' %>
|
<%= render :partial => 'changeset_paging_nav' %>
|
||||||
<% end %>
|
<% 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>
|
<br>
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,46 @@ en:
|
||||||
download: "{{download_xml_link}} or {{view_history_link}}"
|
download: "{{download_xml_link}} or {{view_history_link}}"
|
||||||
download_xml: "Download XML"
|
download_xml: "Download XML"
|
||||||
view_history: "view history"
|
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:
|
diary_entry:
|
||||||
list:
|
list:
|
||||||
new: New Diary Entry
|
new: New Diary Entry
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue