cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rationalize browse translation keys

Browse source
This commit is contained in:
John Firebaugh 2013-11-12 12:51:33 -08:00
parent 1757a5a789
commit e670da54cb
17 changed files with 90 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/browse/_common_details.html.erb
View file

@ -2,30 +2,30 @@
<% if common_details.changeset.tags['comment'].present? %>
<%= linkify(h(common_details.changeset.tags['comment'])) %>
<% else %>
<%= t 'browse.changeset_details.no_comment' %>
<%= t 'browse.no_comment' %>
<% end %>
</h4>
<div class="details">
<% if common_details.visible? %>
<%= t 'browse.common_details.edited' %>
<%= t 'browse.edited' %>
<% else %>
<%= t 'browse.common_details.deleted' %>
<%= t 'browse.deleted' %>
<% end %>
<abbr><%= distance_of_time_in_words_to_now(common_details.timestamp) %> ago</abbr>
<% if common_details.changeset.user.data_public? %>
<%= t 'browse.common_details.by' %>
<%= t 'browse.by' %>
<%= link_to h(common_details.changeset.user.display_name), :controller => "user", :action => "view", :display_name => common_details.changeset.user.display_name %>
<% end %>
</div>
<div class="details">
<%= t 'browse.common_details.version' %>
<%= t 'browse.version' %>
#<%= h(common_details.version) %>
&middot;
<%= t 'browse.common_details.in_changeset' %>
<%= t 'browse.in_changeset' %>
#<%= link_to common_details.changeset_id, :action => :changeset, :id => common_details.changeset_id %>
</div>

2
app/views/browse/_node_details.html.erb
View file

@ -9,7 +9,7 @@
<%= render :partial => "common_details", :object => node_details %>
<% unless node_details.ways.empty? and node_details.containing_relation_members.empty? %>
<h4><%= t 'browse.node_details.part_of' %></h4>
<h4><%= t 'browse.part_of' %></h4>
<ul>
<% node_details.ways.each do |way| %>
<li><%= link_to h(printable_name(way)), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>

4
app/views/browse/_relation_details.html.erb
View file

@ -9,12 +9,12 @@
<%= render :partial => "common_details", :object => relation_details %>
<% unless relation_details.relation_members.empty? %>
<h4><%= t'browse.relation_details.members' %></h4>
<h4><%= t'browse.relation.members' %></h4>
<ul><%= render :partial => "relation_member", :collection => relation_details.relation_members %></ul>
<% end %>
<% unless relation_details.containing_relation_members.empty? %>
<h4><%= t'browse.relation_details.part_of' %></h4>
<h4><%= t'browse.part_of' %></h4>
<ul><%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %></ul>
<% end %>
<% end %>

6
app/views/browse/_way_details.html.erb
View file

@ -9,14 +9,14 @@
<%= render :partial => "common_details", :object => way_details %>
<% unless way_details.way_nodes.empty? %>
<h4><%= t'browse.way_details.nodes' %></h4>
<h4><%= t'browse.way.nodes' %></h4>
<ul>
<% way_details.way_nodes.each do |wn| %>
<li>
<%= link_to h(printable_name(wn.node)), { :action => "node", :id => wn.node_id.to_s }, :class => link_class('node', wn.node), :title => link_title(wn.node) %>
<% related_ways = wn.node.ways.reject { |w| w.id == wn.way_id } %>
<% if related_ways.size > 0 then %>
(<%= raw t 'browse.way_details.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
(<%= raw t 'browse.way.also_part_of', :count => related_ways.size, :related_ways => related_ways.map { |w| link_to(h(printable_name(w)), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
<% end %>
</li>
<% end %>
@ -24,7 +24,7 @@
<% end %>
<% unless way_details.containing_relation_members.empty? %>
<h4><%= t'browse.way_details.part_of' %></h4>
<h4><%= t'browse.part_of' %></h4>
<ul>
<%= render :partial => "containing_relation", :collection => way_details.containing_relation_members %>
</ul>

2
app/views/browse/changeset.html.erb
View file

@ -6,7 +6,7 @@
</h2>
<div class="browse-section">
<h4><%= @changeset.tags['comment'].to_s.presence || t('browse.changeset_details.no_comment') %></h4>
<h4><%= @changeset.tags['comment'].to_s.presence || t('browse.no_comment') %></h4>
<div class="details"><%= changeset_details(@changeset) %></div>
<%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>

4
app/views/browse/node.html.erb
View file

@ -11,7 +11,7 @@
<%= render :partial => "node_details", :object => @node %>
<div class='secondary-actions'>
<%= link_to(t('browse.node.download_xml'), :controller => "node", :action => "read") %>
<%= link_to(t('browse.download_xml'), :controller => "node", :action => "read") %>
&middot;
<%= link_to(t('browse.node.view_history'), :action => "node_history") %>
<%= link_to(t('browse.view_history'), :action => "node_history") %>
</div>

8
app/views/browse/node_history.html.erb
View file

@ -1,11 +1,11 @@
<%
@name = printable_name @node
set_title(t('browse.node_history.node_history') + ' | ' + @name)
set_title(t('browse.node.node_history') + ' | ' + @name)
%>
<h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= raw t'browse.node_history.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>
<%= raw t'browse.node.node_history_title', :node_name => link_to(h(@name), :action => "node", :id => @node.id) %>
</h2>
<% @node.old_nodes.reverse.each do |node| %>
@ -13,7 +13,7 @@
<% end %>
<div class='secondary-actions'>
<%= link_to(t('browse.node_history.download_xml'), :controller => "old_node", :action => "history") %>
<%= link_to(t('browse.download_xml'), :controller => "old_node", :action => "history") %>
&middot;
<%= link_to(t('browse.node_history.view_details'), :action => "node") %>
<%= link_to(t('browse.view_details'), :action => "node") %>
</div>

4
app/views/browse/relation.html.erb
View file

@ -11,7 +11,7 @@
<%= render :partial => "relation_details", :object => @relation %>
<div class='secondary-actions'>
<%= link_to(t('browse.relation.download_xml'), :controller => "relation", :action => "read") %>
<%= link_to(t('browse.download_xml'), :controller => "relation", :action => "read") %>
&middot;
<%= link_to(t('browse.relation.view_history'), :action => "relation_history") %>
<%= link_to(t('browse.view_history'), :action => "relation_history") %>
</div>

8
app/views/browse/relation_history.html.erb
View file

@ -1,11 +1,11 @@
<%
@name = printable_name @relation
set_title(t('browse.relation_history.relation_history') + ' | ' + @name)
set_title(t('browse.relation.relation_history') + ' | ' + @name)
%>
<h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= raw t'browse.relation_history.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>
<%= raw t'browse.relation.relation_history_title', :relation_name => link_to(h(@name), :action => "relation", :id => @relation.id) %>
</h2>
<% @relation.old_relations.reverse.each do |relation| %>
@ -13,7 +13,7 @@
<% end %>
<div class='secondary-actions'>
<%= link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history") %>
<%= link_to(t('browse.download_xml'), :controller => "old_relation", :action => "history") %>
&middot;
<%= link_to(t('browse.relation_history.view_details'), :action => "relation") %>
<%= link_to(t('browse.view_details'), :action => "relation") %>
</div>

4
app/views/browse/way.html.erb
View file

@ -11,7 +11,7 @@
<%= render :partial => "way_details", :object => @way %>
<div class='secondary-actions'>
<%= link_to(t('browse.way.download_xml'), :controller => "way", :action => "read") %>
<%= link_to(t('browse.download_xml'), :controller => "way", :action => "read") %>
&middot;
<%= link_to(t('browse.way.view_history'), :action => "way_history") %>
<%= link_to(t('browse.view_history'), :action => "way_history") %>
</div>

8
app/views/browse/way_history.html.erb
View file

@ -1,11 +1,11 @@
<%
@name = printable_name @way
set_title(t('browse.way_history.way_history') + ' | ' + @name)
set_title(t('browse.way.way_history') + ' | ' + @name)
%>
<h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= raw t'browse.way_history.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>
<%= raw t'browse.way.way_history_title', :way_name => link_to(h(@name), :action => "way", :id => @way.id) %>
</h2>
<% @way.old_ways.reverse.each do |way| %>
@ -13,7 +13,7 @@
<% end %>
<div class='secondary-actions'>
<%= link_to(t('browse.way_history.download_xml'), :controller => "old_way", :action => "history") %>
<%= link_to(t('browse.download_xml'), :controller => "old_way", :action => "history") %>
&middot;
<%= link_to(t('browse.way_history.view_details'), :action => "way") %>
<%= link_to(t('browse.view_details'), :action => "way") %>
</div>