From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Sun, 31 May 2009 16:51:20 +0000 (+0000)
Subject: Some more i18n html titles
X-Git-Tag: live~7319^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/f3bcdd85d721bbc3fde8914d507c3e92590d9337

Some more i18n html titles
---

diff --git a/app/controllers/browse_controller.rb b/app/controllers/browse_controller.rb
index 12ede13da..d3af27217 100644
--- a/app/controllers/browse_controller.rb
+++ b/app/controllers/browse_controller.rb
@@ -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
diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 018f4a48a..d5f6f59fc 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -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',
diff --git a/config/locales/en.yml b/config/locales/en.yml
index cf36f4cd3..118217f87 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -5,6 +5,7 @@ en:
     coordinates: "Coordinates:"
   browse:
     changeset:
+      title: "Changeset"
       changeset: "Changeset:"
       download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
@@ -145,6 +146,7 @@ en:
       recent_changes: "Recent Changes"
   diary_entry:
     list:
+      title: "Users' diaries"
       new: New Diary Entry
       new_title: Compose a new entry in your user diary
       no_entries: No diary entries
@@ -152,6 +154,7 @@ en:
       older_entries: Older Entries
       newer_entries: Newer Entries
     edit:
+      title: "Edit diary entry"
       subject: "Subject: "
       body: "Body: "
       language: "Language: "