cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove explicit specification of I18n.local as the locale in resource

Browse source 
lookups - it's the default anyway.
This commit is contained in:
Tom Hughes 2009-08-18 20:21:25 +00:00
parent 885d29345d
commit 43d9b32012
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/diary_entry_controller.rb
View file

@ -103,7 +103,7 @@ class DiaryEntryController < ApplicationController
if user if user
@entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20) @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) @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
@link = "http://#{SERVER_URL}/user/#{user.display_name}/diary" @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
else else
@ -113,8 +113,8 @@ class DiaryEntryController < ApplicationController
@entries = DiaryEntry.find(:all, :include => :user, @entries = DiaryEntry.find(:all, :include => :user,
:conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]], :conditions => ["users.visible = ? AND diary_entries.language_code = ?", true, params[:language]],
:order => 'created_at DESC', :limit => 20) :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) @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, :locale => I18n.locale) @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
@link = "http://#{SERVER_URL}/diary/#{params[:language]}" @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
else else
@entries = DiaryEntry.find(:all, :include => :user, @entries = DiaryEntry.find(:all, :include => :user,