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 bfcdc499e3168c9ea7ea527658ebaf00cf86f30e..60b682693fa716ba896b116520b013d271028efa 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,5 +1,3 @@
-require "base64"
-
 class Notifier < ActionMailer::Base
   default :from => EMAIL_FROM,
           :return_path => EMAIL_RETURN_PATH,
@@ -161,8 +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)
-      @commenter_thumbnail_src = comment.author.image.url(:small, :host => SERVER_URL)
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
@@ -173,8 +169,8 @@ 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['avatar.png'] = File.read(user_avatar_file_path(comment.author))
+      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
     end
@@ -185,9 +181,9 @@ class Notifier < ActionMailer::Base
   def user_avatar_file_path(user)
     image = user.image
     if image.file?
-      return image.path.sub('/original/', '/small/')
+      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
 
@@ -208,5 +204,4 @@ class Notifier < ActionMailer::Base
       EMAIL_FROM
     end
   end
-
 end