Add parentheses to avoid warnings.

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index af66cd7f9e9828aaa5344fa2edf746ccdf9e82d7..35b521e1fdfdd4918f82f3aa604a97a4f7b331d4 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,53 +1,110 @@
 class Notifier < ActionMailer::Base
-
-  def signup_confirm( user, token )
-    @recipients = user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] Confirm your email address'
-    @body['url'] = "http://#{SERVER_URL}/user/confirm?confirm_string=#{token.token}"
+  def signup_confirm(user, token)
+    common_headers user
+    subject I18n.t('notifier.signup_confirm.subject')
+    body :url => url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "confirm",
+                         :confirm_string => token.token)
   end
 
-  def lost_password( user, token )
-    @recipients = user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] Password reset request'
-    @body['url'] = "http://#{SERVER_URL}/user/reset_password?email=#{user.email}&token=#{token.token}"
+  def email_confirm(user, token)
+    common_headers user
+    recipients user.new_email
+    subject I18n.t('notifier.email_confirm.subject')
+    body :address => user.new_email,
+         :url => url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "confirm_email",
+                         :confirm_string => token.token)
   end
 
-  def reset_password(user, pass)
-    @recipients = user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] Password reset'
-    @body['pass'] = pass
+  def lost_password(user, token)
+    common_headers user
+    subject I18n.t('notifier.lost_password.subject')
+    body :url => url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "reset_password",
+                         :token => token.token)
   end
 
   def gpx_success(trace, possible_points)
-    @recipients = trace.user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] GPX Import success'
-    @body['trace_name'] = trace.name
-    @body['trace_points'] = trace.size
-    @body['possible_points'] = possible_points
+    common_headers trace.user
+    subject I18n.t('notifier.gpx_notification.success.subject')
+    body :trace_name => trace.name,
+         :trace_points => trace.size,
+         :trace_description => trace.description,
+         :trace_tags => trace.tags,
+         :possible_points => possible_points
   end
 
   def gpx_failure(trace, error)
-    @recipients = trace.user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] GPX Import failure'
-    @body['trace_name'] = trace.name
-    @body['error'] = error
+    common_headers trace.user
+    from "webmaster@openstreetmap.org"
+    subject I18n.t('notifier.gpx_notification.failure.subject')
+    body :trace_name => trace.name,
+         :trace_description => trace.description,
+         :trace_tags => trace.tags,
+         :error => error
   end
   
   def message_notification(message)
-    @from_user = User.find(message.from_user_id)
-    @to_user = User.find(message.to_user_id)
-    @recipients = @to_user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = "[OpenStreetMap] #{@from_user.display_name} sent you a new message"
-    @body['to_user'] = @to_user.display_name
-    @body['from_user'] = @from_user.display_name
-    @body['body'] = message.body
-    @body['subject'] = message.title
-    @body['url'] = "http://#{SERVER_URL}/message/read/#{message.id}"
+    common_headers message.recipient
+    subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name, :locale => locale)
+    body :to_user => message.recipient.display_name,
+         :from_user => message.sender.display_name,
+         :body => message.body,
+         :title => message.title,
+         :readurl => url_for(:host => SERVER_URL,
+                             :controller => "message", :action => "read",
+                             :message_id => message.id),
+         :replyurl => url_for(:host => SERVER_URL,
+                              :controller => "message", :action => "reply",
+                              :message_id => message.id)
+  end
+
+  def diary_comment_notification(comment)
+    common_headers comment.diary_entry.user
+    subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name, :locale => locale)
+    body :to_user => comment.diary_entry.user.display_name,
+         :from_user => comment.user.display_name,
+         :body => comment.body,
+         :title => comment.diary_entry.title,
+         :readurl => url_for(:host => SERVER_URL,
+                             :controller => "diary_entry",
+                             :action => "view",
+                             :display_name => comment.diary_entry.user.display_name,
+                             :id => comment.diary_entry.id,
+                             :anchor => "comment#{comment.id}"),
+         :commenturl => url_for(:host => SERVER_URL,
+                                :controller => "diary_entry",
+                                :action => "view",
+                                :display_name => comment.diary_entry.user.display_name,
+                                :id => comment.diary_entry.id,
+                                :anchor => "newcomment"),
+         :replyurl => url_for(:host => SERVER_URL,
+                              :controller => "message",
+                              :action => "new",
+                              :user_id => comment.user.id,
+                              :title => "Re: #{comment.diary_entry.title}")
+  end
+
+  def friend_notification(friend)
+    befriender = User.find_by_id(friend.user_id)
+    befriendee = User.find_by_id(friend.friend_user_id)
+
+    common_headers befriendee
+    subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name, :locale => locale)
+    body :user => befriender.display_name,
+         :userurl => url_for(:host => SERVER_URL,
+                             :controller => "user", :action => "view",
+                             :display_name => befriender.display_name)
+  end
+
+private
+
+  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"
   end
 end