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

Some more i18n html titles

Browse source
This commit is contained in:
Shaun McDonald 2009-05-31 16:51:20 +00:00
parent 99903362ca
commit f3bcdd85d7
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/browse_controller.rb
View file

@ -64,7 +64,7 @@ class BrowseController < ApplicationController
@way_pages, @ways = paginate(:old_ways, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'way_page')
@relation_pages, @relations = paginate(:old_relations, :conditions => {:changeset_id => @changeset.id}, :per_page => 20, :parameter => 'relation_page')
@title = "Changeset | #{@changeset.id}"
@title = "#{I18n.t('browse.changeset.title')} | #{@changeset.id}"
@next = Changeset.find(:first, :order => "id ASC", :conditions => [ "id > :id", { :id => @changeset.id }] )
@prev = Changeset.find(:first, :order => "id DESC", :conditions => [ "id < :id", { :id => @changeset.id }] )
rescue ActiveRecord::RecordNotFound

6
app/controllers/diary_entry_controller.rb
View file

@ -8,7 +8,7 @@ class DiaryEntryController < ApplicationController
before_filter :check_database_writable, :only => [:new, :edit]
def new
@title = 'New diary entry'
@title = I18n.t('diary_entry.list.new')
if params[:diary_entry]
@diary_entry = DiaryEntry.new(params[:diary_entry])
@ -26,7 +26,7 @@ class DiaryEntryController < ApplicationController
end
def edit
@title= 'Edit diary entry'
@title= I18n.t('diary_entry.edit.title')
@diary_entry = DiaryEntry.find(params[:id])
if @user != @diary_entry.user
@ -70,7 +70,7 @@ class DiaryEntryController < ApplicationController
render :action => 'no_such_user', :status => :not_found
end
else
@title = "Users' diaries"
@title = I18n.t('diary_entry.list.title')
@entry_pages, @entries = paginate(:diary_entries, :include => :user,
:conditions => ["users.visible = ?", true],
:order => 'created_at DESC',