X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e0b175d3bd3ef655a20273dc2b7f04a8a34bb5f6..518cf69b3429d12b22efe52b5be8fd3e910b7ac4:/app/controllers/diary_entry_controller.rb diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index c0b974c5e..f2c11fc74 100644 --- 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