X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/043d29fd7eb72048cf5d07edfbc20ec5c25af708..88ba316abeecffccd1cb51c63ce5594c95023624:/app/helpers/note_helper.rb

diff --git a/app/helpers/note_helper.rb b/app/helpers/note_helper.rb
index 6ebd18345..7e52937a0 100644
--- a/app/helpers/note_helper.rb
+++ b/app/helpers/note_helper.rb
@@ -1,14 +1,16 @@
 module NoteHelper
+  include ActionView::Helpers::TranslationHelper
+
   def note_event(event, at, by)
     if by.nil?
-      I18n.t("browse.note." + event + "_by_anonymous",
-             :when => friendly_date(at),
-             :exact_time => l(at)).html_safe
+      t("browse.note.#{event}_by_anonymous_html",
+        :when => friendly_date_ago(at),
+        :exact_time => l(at))
     else
-      I18n.t("browse.note." + event + "_by",
-             :when => friendly_date(at),
-             :exact_time => l(at),
-             :user => note_author(by)).html_safe
+      t("browse.note.#{event}_by_html",
+        :when => friendly_date_ago(at),
+        :exact_time => l(at),
+        :user => note_author(by))
     end
   end
 
@@ -16,9 +18,9 @@ module NoteHelper
     if author.nil?
       ""
     elsif author.status == "deleted"
-      t("user.no_such_user.deleted")
+      t("users.no_such_user.deleted")
     else
-      link_to h(author.display_name), link_options.merge(:controller => "user", :action => "view", :display_name => author.display_name)
+      link_to h(author.display_name), link_options.merge(:controller => "/users", :action => "show", :display_name => author.display_name)
     end
   end
 end