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 735c51dcd95931c57197e801d8afe2f2554f6122..6c7c9658bd6cd73d508b14bc80ee7256fc9fb1ca 100644 (file)
--- 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
                                  :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
       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 962551b41cade06a61f818483ffef9df4526e20b..7c8a159ee1915d3a8ec7f6bae454fefdc4b44b9a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -313,7 +313,7 @@ en:
       save_button: "Save"
       marker_text: Diary entry location
     view:
       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"
       user_title: "{{user}}'s diary"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment: "{{login_link}} to leave a comment"