Merge remote-tracking branch 'upstream/pull/1973'

diff --combined app/helpers/issues_helper.rb
index 092050bf1857f078ee52e35a08d276a01fd02e77,474249648bc5434dd77a575091c2e074fc695c8b..4ecd7001af131074ea3ca18de9fc4186e9ede2fe
--- 1/app/helpers/issues_helper.rb
--- 2/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@@ -2,11 -2,11 +2,11 @@@ module IssuesHelpe
    def reportable_url(reportable)
      case reportable
      when DiaryEntry
-       url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.user.display_name, :id => reportable.id)
+       diary_entry_url(reportable.user, reportable)
      when User
 -      url_for(:controller => reportable.class.name.underscore, :action => :view, :display_name => reportable.display_name)
 +      user_url(reportable)
      when DiaryComment
-       url_for(:controller => reportable.diary_entry.class.name.underscore, :action => :view, :display_name => reportable.diary_entry.user.display_name, :id => reportable.diary_entry.id, :anchor => "comment#{reportable.id}")
+       diary_entry_url(reportable.diary_entry.user, reportable.diary_entry, :anchor => "comment#{reportable.id}")
      when Note
        url_for(:controller => :browse, :action => :note, :id => reportable.id)
      end

diff --combined app/models/notifier.rb
index 309b0065c908d091472c3d65e7249e1038c5981e,3008b7fa42742c349c09dbd6d364569895d86d1e..554d1e364ffc5c1e01b83ee63f903fa61709bfba
--- 1/app/models/notifier.rb
--- 2/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@@ -87,16 -87,8 +87,8 @@@ class Notifier < ActionMailer::Bas
        @from_user = comment.user.display_name
        @text = comment.body
        @title = comment.diary_entry.title
-       @readurl = url_for(:controller => "diary_entry",
-                          :action => "view",
-                          :display_name => comment.diary_entry.user.display_name,
-                          :id => comment.diary_entry.id,
-                          :anchor => "comment#{comment.id}")
-       @commenturl = url_for(:controller => "diary_entry",
-                             :action => "view",
-                             :display_name => comment.diary_entry.user.display_name,
-                             :id => comment.diary_entry.id,
-                             :anchor => "newcomment")
+       @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
+       @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
        @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
  
        @author = @from_user
@@@ -112,7 -104,8 +104,7 @@@
    def friend_notification(friend)
      with_recipient_locale friend.befriendee do
        @friend = friend
 -      @viewurl = url_for(:controller => "user", :action => "view",
 -                         :display_name => @friend.befriender.display_name)
 +      @viewurl = user_url(@friend.befriender)
        @friendurl = url_for(:controller => "user", :action => "make_friend",
                             :display_name => @friend.befriender.display_name)
        @author = @friend.befriender.display_name

diff --combined config/locales/en.yml
index 2e2cf331e285aa0d5f35ab0af950341a1eadce9a,5c1de05776d5bb90bf733b17ef2848e6d617d116..872a31f6db38cb48c76a2ab276283678146d953b
--- 1/config/locales/en.yml
--- 2/config/locales/en.yml
+++ b/config/locales/en.yml
@@@ -276,7 -276,7 +276,7 @@@ en
        use_map_link: "use map"
        save_button: "Save"
        marker_text: Diary entry location
-     view:
+     show:
        title: "%{user}'s diary | %{title}"
        user_title: "%{user}'s diary"
        leave_a_comment: "Leave a comment"
@@@ -2006,7 -2006,7 +2006,7 @@@
        heading: "The user %{user} does not exist"
        body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
        deleted: "deleted"
 -    view:
 +    show:
        my diary: My Diary
        new diary entry: new diary entry
        my edits: My Edits

diff --combined config/routes.rb
index 16c05fea5f1a852ed5b6b9622e9149558a382399,0b415085d6939af1487cc3db2148274e8ca9be9c..579dced162150f35de09c88c03bb2a9c5e07fc29
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -208,8 -208,10 +208,8 @@@ OpenStreetMap::Application.routes.draw 
    get "/traces/mine/tag/:tag" => "traces#mine"
    get "/traces/mine/page/:page" => "traces#mine"
    get "/traces/mine" => "traces#mine"
 -  post "/trace/create" => "traces#create" # remove after deployment
    get "/trace/create", :to => redirect(:path => "/traces/new")
    get "/trace/:id/data" => "traces#data", :id => /\d+/, :as => "trace_data"
 -  post "trace/:id/edit" => "traces#update" # remove after deployment
    get "/trace/:id/edit", :to => redirect(:path => "/traces/%{id}/edit")
    post "/trace/:id/delete" => "traces#delete", :id => /\d+/
  
@@@ -225,7 -227,7 +225,7 @@@
    get "/user/:display_name/diary" => "diary_entry#list"
    get "/diary/:language" => "diary_entry#list"
    get "/diary" => "diary_entry#list"
-   get "/user/:display_name/diary/:id" => "diary_entry#view", :id => /\d+/, :as => :diary_entry
+   get "/user/:display_name/diary/:id" => "diary_entry#show", :id => /\d+/, :as => :diary_entry
    post "/user/:display_name/diary/:id/newcomment" => "diary_entry#comment", :id => /\d+/
    match "/user/:display_name/diary/:id/edit" => "diary_entry#edit", :via => [:get, :post], :id => /\d+/
    post "/user/:display_name/diary/:id/hide" => "diary_entry#hide", :id => /\d+/, :as => :hide_diary_entry
@@@ -234,7 -236,7 +234,7 @@@
    post "/user/:display_name/diary/:id/unsubscribe" => "diary_entry#unsubscribe", :as => :diary_entry_unsubscribe, :id => /\d+/
  
    # user pages
 -  get "/user/:display_name" => "user#view", :as => "user"
 +  get "/user/:display_name" => "user#show", :as => "user"
    match "/user/:display_name/make_friend" => "user#make_friend", :via => [:get, :post], :as => "make_friend"
    match "/user/:display_name/remove_friend" => "user#remove_friend", :via => [:get, :post], :as => "remove_friend"
    match "/user/:display_name/account" => "user#account", :via => [:get, :post]