Use "confirm_email" instead "confirm email" in resource names so it

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index c2ff4c53a740edef47fb067436120eaed14bd936..4500e527f9914edd454be7fb39e8a647a23518d7 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -72,7 +72,7 @@ class Notifier < ActionMailer::Base
     body :to_user => comment.diary_entry.user.display_name,
          :from_user => comment.user.display_name,
          :body => comment.body,
     body :to_user => comment.diary_entry.user.display_name,
          :from_user => comment.user.display_name,
          :body => comment.body,

-         :subject => comment.diary_entry.title,
+         :title => comment.diary_entry.title,

          :readurl => url_for(:host => SERVER_URL,
                              :controller => "diary_entry",
                              :action => "view",
          :readurl => url_for(:host => SERVER_URL,
                              :controller => "diary_entry",
                              :action => "view",


@@ -108,6 +108,7 @@ private
 
   def common_headers(recipient)
     recipients recipient.email
 
   def common_headers(recipient)
     recipients recipient.email

+    locale recipient.preferred_language_from(I18n.available_locales)

     from "webmaster@openstreetmap.org"
     headers "return-path" => "bounces@openstreetmap.org",
             "Auto-Submitted" => "auto-generated"
     from "webmaster@openstreetmap.org"
     headers "return-path" => "bounces@openstreetmap.org",
             "Auto-Submitted" => "auto-generated"