Merge remote-tracking branch 'upstream/pull/1894'

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index c0b974c5ede139bee5f1bd731154799bc79c61d2..f2c11fc741453c2ee3b643ea266eae5682281583 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -155,8 +155,8 @@ class DiaryEntryController < ApplicationController
 
       if user
         @entries = user.diary_entries
-        @title = I18n.t("diary_entry.feed.user.title", :user => user.display_name)
-        @description = I18n.t("diary_entry.feed.user.description", :user => user.display_name)
+        @title = t("diary_entry.feed.user.title", :user => user.display_name)
+        @description = t("diary_entry.feed.user.description", :user => user.display_name)
         @link = url_for :controller => "diary_entry", :action => "list", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
       else
         head :not_found
@@ -167,12 +167,12 @@ class DiaryEntryController < ApplicationController
 
       if params[:language]
         @entries = @entries.where(:language_code => params[:language])
-        @title = I18n.t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
-        @description = I18n.t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
+        @title = t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
+        @description = t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
         @link = url_for :controller => "diary_entry", :action => "list", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
       else
-        @title = I18n.t("diary_entry.feed.all.title")
-        @description = I18n.t("diary_entry.feed.all.description")
+        @title = t("diary_entry.feed.all.title")
+        @description = t("diary_entry.feed.all.description")
         @link = url_for :controller => "diary_entry", :action => "list", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
       end
     end

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>
-    <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>
-  <%= t '.sorry', :type=> browse_timeout_type[@type] , :id => params[:id] %>
+  <%= t '.sorry', :type => t(".type.#{@type}"), :id => params[:id] %>
 </div>