Fix lazy i18n lookups for browse error pages

`I18n.t` doesn't support lazy lookups, whereas the equivalent
rails `t` helper does. The code can also be simplified to avoid the
lookup table.

Fixes 1877

diff --git a/app/views/browse/not_found.html.erb b/app/views/browse/not_found.html.erb
index 5fe22a68a43c600bcfe701bd6202977e88686c6e..3c4e8a4c837db40655e4c36e717fc52e22f45147 100644 (file)
--- a/app/views/browse/not_found.html.erb
+++ b/app/views/browse/not_found.html.erb
@@ -1,12 +1,4 @@
-<%
-  browse_not_found_type = {
-    'node' => I18n.t('.type.node'),
-    'way' => I18n.t('.type.way'),
-    'relation' => I18n.t('.type.relation'),
-    'changeset' => I18n.t('.type.changeset'),
-  };
-%>
-

 <h2>
 <h2>

-    <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
-    <%= t '.sorry', :type=> browse_not_found_type[@type] , :id => params[:id] %></h2>
+  <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
+  <%= t ".sorry", :type => t(".type.#{@type}"), :id => params[:id] %>
+</h2>

diff --git a/app/views/browse/timeout.html.erb b/app/views/browse/timeout.html.erb
index de102e60f29c5dddcf0c6a3bb2fc035bb176dd5a..e6dd7b68d5d20ede57ae500b2692e44ca3ffabdd 100644 (file)
--- a/app/views/browse/timeout.html.erb
+++ b/app/views/browse/timeout.html.erb
@@ -1,12 +1,4 @@
-<%
-  browse_timeout_type = {
-    'node' => I18n.t('.type.node'),
-    'way' => I18n.t('.type.way'),
-    'relation' => I18n.t('.type.relation'),
-    'changeset' => I18n.t('.type.changeset'),
-  };
-%>

 <div class="browse-section">
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 <div class="browse-section">
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= t '.sorry', :type=> browse_timeout_type[@type] , :id => params[:id] %>
+  <%= t '.sorry', :type => t(".type.#{@type}"), :id => params[:id] %>

 </div>
 </div>