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

Isolate object names from the database with a <bdi> tag

Browse source 
Fixes #743
This commit is contained in:
Tom Hughes 2014-05-18 17:16:36 +01:00
parent 2bdd542d9b
commit 5da273027f
9 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/helpers/browse_helper.rb
View file

@ -14,13 +14,13 @@ module BrowseHelper
# away redacted version tag information.
unless object.redacted?
if object.tags.include? "name:#{I18n.locale}"
name = t 'printable_name.with_name', :name => object.tags["name:#{I18n.locale}"].to_s, :id => name
name = t 'printable_name.with_name_html', :name => content_tag(:bdi, object.tags["name:#{I18n.locale}"].to_s ), :id => name
elsif object.tags.include? 'name'
name = t 'printable_name.with_name', :name => object.tags['name'].to_s, :id => name
name = t 'printable_name.with_name_html', :name => content_tag(:bdi, object.tags['name'].to_s ), :id => name
end
end
return name
name
end
def link_class(type, object)

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

@ -14,7 +14,7 @@
<h4><%= t 'browse.part_of' %></h4>
<ul>
<% node.ways.uniq.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>
<li><%= link_to printable_name(way), { :action => "way", :id => way.id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
<%= render :partial => "containing_relation", :collection => node.containing_relation_members.uniq %>
</ul>

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

@ -1,6 +1,6 @@
<%
member_class = link_class(relation_member.member_type.downcase, relation_member.member)
linked_name = link_to h(printable_name(relation_member.member)), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member)
linked_name = link_to printable_name(relation_member.member), { :action => relation_member.member_type.downcase, :id => relation_member.member_id.to_s }, :title => link_title(relation_member.member)
type_str = t'browse.relation_member.type.' + relation_member.member_type.downcase
%>
<li class="<%= member_class %>"><%=
@ -9,4 +9,4 @@
else
raw t'browse.relation_member.entry_role', :type => type_str, :name => linked_name, :role => h(relation_member.member_role)
end
%></li>
%></li>

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

@ -15,10 +15,10 @@
<ul>
<% way.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) %>
<%= link_to 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.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(printable_name(w), { :action => "way", :id => w.id.to_s }, :class => link_class('way', w), :title => link_title(w) ) }.to_sentence %>)
<% end %>
</li>
<% end %>

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

@ -18,7 +18,7 @@
</h4>
<ul>
<% @ways.each do |way| %>
<li><%= link_to h(printable_name(way, true)), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<li><%= link_to printable_name(way, true), { :action => "way", :id => way.way_id.to_s }, :class => link_class('way', way), :title => link_title(way) %></li>
<% end %>
</ul>
<% end %>
@ -30,7 +30,7 @@
</h4>
<ul>
<% @relations.each do |relation| %>
<li><%= link_to h(printable_name(relation, true)), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<li><%= link_to printable_name(relation, true), { :action => "relation", :id => relation.relation_id.to_s }, :class => link_class('relation', relation), :title => link_title(relation) %></li>
<% end %>
</ul>
<% end %>
@ -42,7 +42,7 @@
</h4>
<ul>
<% @nodes.each do |node| %>
<li><%= link_to h(printable_name(node, true)), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
<% end %>
</ul>
<% end %>

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

@ -2,7 +2,7 @@
<h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= t("browse.#{@type}.title", :name => printable_name(@feature)) %>
<%= raw t("browse.#{@type}.title", :name => printable_name(@feature)) %>
</h2>
<%= render :partial => @type, :object => @feature %>

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

@ -2,7 +2,7 @@
<h2>
<a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
<%= t("browse.#{@type}.history_title", :name => printable_name(@feature)) %>
<%= raw t("browse.#{@type}.history_title", :name => printable_name(@feature)) %>
</h2>
<%= render :partial => @type, :collection => @feature.send("old_#{@type}s").reverse %>

2
config/locales/en.yml
View file

@ -79,7 +79,7 @@ en:
printable_name:
with_id: "%{id}"
with_version: "%{id}, v%{version}"
with_name: "%{name} (%{id})"
with_name_html: "%{name} (%{id})"
editor:
default: "Default (currently %{name})"
potlatch:

18
test/helpers/browse_helper_test.rb
View file

@ -14,28 +14,28 @@ class BrowseHelperTest < ActionView::TestCase
def test_printable_name
assert_equal "17", printable_name(current_nodes(:redacted_node))
assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
assert_equal "<bdi>Test Node</bdi> (18)", printable_name(current_nodes(:node_with_name))
assert_equal "<bdi>Test Node</bdi> (18)", printable_name(nodes(:node_with_name_current_version))
assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
assert_equal "<bdi>Test Node</bdi> (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
I18n.locale = "ru"
assert_equal "17", printable_name(current_nodes(:redacted_node))
assert_equal "проверки узла (18)", printable_name(current_nodes(:node_with_name))
assert_equal "проверки узла (18)", printable_name(nodes(:node_with_name_current_version))
assert_equal "<bdi>проверки узла</bdi> (18)", printable_name(current_nodes(:node_with_name))
assert_equal "<bdi>проверки узла</bdi> (18)", printable_name(nodes(:node_with_name_current_version))
assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
assert_equal "проверки узла (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
assert_equal "<bdi>проверки узла</bdi> (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
I18n.locale = "de"
assert_equal "17", printable_name(current_nodes(:redacted_node))
assert_equal "Test Node (18)", printable_name(current_nodes(:node_with_name))
assert_equal "Test Node (18)", printable_name(nodes(:node_with_name_current_version))
assert_equal "<bdi>Test Node</bdi> (18)", printable_name(current_nodes(:node_with_name))
assert_equal "<bdi>Test Node</bdi> (18)", printable_name(nodes(:node_with_name_current_version))
assert_equal "18", printable_name(nodes(:node_with_name_redacted_version))
assert_equal "Test Node (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
assert_equal "<bdi>Test Node</bdi> (18, v2)", printable_name(nodes(:node_with_name_current_version), true)
assert_equal "18, v1", printable_name(nodes(:node_with_name_redacted_version), true)
end