From: Tom Hughes <tom@compton.nu>
Date: Mon, 8 Feb 2010 18:15:51 +0000 (+0000)
Subject: Improve page title for diary entries. Closes #2702.
X-Git-Tag: live~7585^2~41
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d907b40eabd3c9560e9d9a88232dbda494a32e3c

Improve page title for diary entries. Closes #2702.
---

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 735c51dcd..6c7c9658b 100644
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -166,7 +166,7 @@ class DiaryEntryController < ApplicationController
                                  :visible => true
                                })
       if @entry
-        @title = t 'diary_entry.view.title', :user => params[:display_name]
+        @title = t 'diary_entry.view.title', :user => params[:display_name], :title => @entry.title
       else
         @title = t 'diary_entry.no_such_entry.title', :id => params[:id]
         render :action => 'no_such_entry', :status => :not_found
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 962551b41..7c8a159ee 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -313,7 +313,7 @@ en:
       save_button: "Save"
       marker_text: Diary entry location
     view:
-      title: "Users' diaries | {{user}}"
+      title: "{{user}}'s diary | {{title}}"
       user_title: "{{user}}'s diary"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment: "{{login_link}} to leave a comment"