Remove HTML markup from locale file

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 40a516a927a388d81d91b0bd8a0012a6102e2def..60b682693fa716ba896b116520b013d271028efa 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -159,7 +159,6 @@ class Notifier < ActionMailer::Base
       @comment = comment.body
       @owner = recipient == comment.changeset.user
       @commenter = comment.author.display_name
-      @commenter_url = user_url(comment.author.display_name, :host => SERVER_URL)
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
@@ -170,7 +169,7 @@ class Notifier < ActionMailer::Base
                   I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
                 end
 
-      attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
+      attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
       attachments.inline["avatar.png"] = File.read(user_avatar_file_path(comment.author))
 
       mail :to => recipient.email, :subject => subject
@@ -184,7 +183,7 @@ class Notifier < ActionMailer::Base
     if image.file?
       return image.path(:small)
     else
-      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
+      return "#{Rails.root}/app/assets/images/users/images/small.png"
     end
   end