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

app/helpers/issues_helper.rb

@@ -8,7 +8,7 @@ module IssuesHelper
     when DiaryComment
       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)
+      note_url(reportable)
     end
   end
 

app/helpers/note_helper.rb

@@ -3,11 +3,11 @@ module NoteHelper
 
   def note_event(event, at, by)
     if by.nil?
-      t("browse.note.#{event}_by_anonymous_html",
+      t("notes.show.#{event}_by_anonymous_html",
         :when => friendly_date_ago(at),
         :exact_time => l(at))
     else
-      t("browse.note.#{event}_by_html",
+      t("notes.show.#{event}_by_html",
         :when => friendly_date_ago(at),
         :exact_time => l(at),
         :user => note_author(by))