Drop with_format and user the new :formats render option instead

[rails.git] / app / views / site / key.html.erb

diff --git a/app/views/site/key.html.erb b/app/views/site/key.html.erb
index 97544242671847f531ed8accc0a44767073f98bb..294224b189612ccefb5cefa335d3cbc112ef6fc3 100644 (file)
--- a/app/views/site/key.html.erb
+++ b/app/views/site/key.html.erb
@@ -1,7 +1,6 @@
 <div id="mapkey">
-  <h3><%= t "site.key.table.heading", :zoom_level => params[:zoom] %></h3>
   <table class="mapkey-table">
-    <% YAML.load_file("#{RAILS_ROOT}/config/key.yml").each do |name,data| %>
+    <% YAML.load_file("#{Rails.root}/config/key.yml").each do |name,data| %>
       <% if params[:layer] == name %>
         <% data.each do |entry| %>
           <% if params[:zoom].to_i >= entry['min_zoom'] && params[:zoom].to_i <= entry['max_zoom'] %>
@@ -10,7 +9,7 @@
                 <%= image_tag "key/#{name}/#{entry['image']}" %>
               </td>
               <td class="mapkey-table-value">
-                <%= t "site.key.table.entry.#{entry['name']}" %>
+                <%= [*t("site.key.table.entry.#{entry['name']}")].to_sentence %>
               </td>
             </tr>
           <% end %>