From 43d9b32012fdf40132edcbcf5b9beb8f66270793 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 18 Aug 2009 20:21:25 +0000 Subject: [PATCH] Remove explicit specification of I18n.local as the locale in resource lookups - it's the default anyway. --- app/controllers/diary_entry_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 112b80182..690b4292b 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -103,7 +103,7 @@ class DiaryEntryController < ApplicationController if user @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20) - @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name, :locale => I18n.locale) + @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name) @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name) @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary" else @@ -113,8 +113,8 @@ class DiaryEntryController < ApplicationController @entries = DiaryEntry.find(:all, :include => :user, :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]], :order => 'created_at DESC', :limit => 20) - @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name, :locale => I18n.locale) - @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name, :locale => I18n.locale) + @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) @link = "http://#{SERVER_URL}/diary/#{params[:language]}" else @entries = DiaryEntry.find(:all, :include => :user, -- 2.43.2