Remove typo

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index e8c9259cbe2aa7107c08ff7bc803d8cabf86e3b3..b1a94a77de0ccfe517edb96e9228f2eddef520d2 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,129 +1,190 @@
 class Notifier < ActionMailer::Base
 class Notifier < ActionMailer::Base

+  default :from => EMAIL_FROM,
+          :return_path => EMAIL_RETURN_PATH,
+          :auto_submitted => "auto-generated"
+  helper :application
+

   def signup_confirm(user, 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",
-                         :display_name => user.display_name,
-                         :confirm_string => token.token)
+    with_recipient_locale user do
+      @url = url_for(:host => SERVER_URL,
+                     :controller => "user", :action => "confirm",
+                     :display_name => user.display_name,
+                     :confirm_string => token.token)
+
+      mail :to => user.email,
+           :subject => I18n.t('notifier.signup_confirm.subject')
+    end

   end
 
   def email_confirm(user, token)
   end
 
   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)
+    with_recipient_locale user do
+      @address = user.new_email
+      @url = url_for(:host => SERVER_URL,
+                     :controller => "user", :action => "confirm_email",
+                     :confirm_string => token.token)
+
+      mail :to => user.new_email,
+           :subject => I18n.t('notifier.email_confirm.subject')
+    end

   end
 
   def lost_password(user, token)
   end
 
   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)
+    with_recipient_locale user do
+      @url = url_for(:host => SERVER_URL,
+                     :controller => "user", :action => "reset_password",
+                     :token => token.token)
+
+      mail :to => user.email,
+           :subject => I18n.t('notifier.lost_password.subject')
+    end

   end
 
   def gpx_success(trace, possible_points)
   end
 
   def gpx_success(trace, 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
+    with_recipient_locale trace.user do
+      @trace_name = trace.name
+      @trace_points = trace.size
+      @trace_description = trace.description
+      @trace_tags = trace.tags
+      @possible_points = possible_points
+
+      mail :to => trace.user.email,
+           :subject => I18n.t('notifier.gpx_notification.success.subject')
+    end

   end
 
   def gpx_failure(trace, error)
   end
 
   def gpx_failure(trace, 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
+    with_recipient_locale trace.user do
+      @trace_name = trace.name
+      @trace_description = trace.description
+      @trace_tags = trace.tags
+      @error = error
+
+      mail :to => trace.user.email,
+           :subject => I18n.t('notifier.gpx_notification.failure.subject')
+    end

   end
   end

-  
+

   def message_notification(message)
   def message_notification(message)

-    common_headers message.recipient
-    from_header message.sender.display_name, "m", message.id, message.digest
-    subject I18n.t('notifier.message_notification.subject_header', :subject => message.title, :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)
+    with_recipient_locale message.recipient do
+      @to_user = message.recipient.display_name
+      @from_user = message.sender.display_name
+      @text = 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)
+
+      mail :from => from_address(message.sender.display_name, "m", message.id, message.digest),
+           :to => message.recipient.email,
+           :subject => I18n.t('notifier.message_notification.subject_header', :subject => message.title)
+    end

   end
 
   def diary_comment_notification(comment)
   end
 
   def diary_comment_notification(comment)

-    common_headers comment.diary_entry.user
-    from_header comment.user.display_name, "c", comment.id, comment.digest
-    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",
-                              :display_name => comment.user.display_name,
-                              :title => "Re: #{comment.diary_entry.title}")
+    with_recipient_locale comment.diary_entry.user do
+      @to_user = comment.diary_entry.user.display_name
+      @from_user = comment.user.display_name
+      @text = 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",
+                          :display_name => comment.user.display_name,
+                          :title => "Re: #{comment.diary_entry.title}")
+
+      mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest),
+           :to =>  comment.diary_entry.user.email,
+           :subject => I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name)
+    end

   end
 
   def friend_notification(friend)
   end
 
   def friend_notification(friend)

-    common_headers friend.befriendee
-    subject I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => locale)
-    body :friend => friend
+    with_recipient_locale friend.befriendee do
+      @friend = friend
+
+      mail :to => friend.befriendee.email,
+           :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name)
+    end

   end
 
   end
 

-  def bug_comment_notification(bug_comment, recipient)
-    common_headers recipient
-    owner = (recipient == bug_comment.map_bug.author);
-    subject I18n.t('notifier.map_bug_plain.subject_own', :commenter => bug_comment.author_name) if owner
-    subject I18n.t('notifier.map_bug_plain.subject_other', :commenter => bug_comment.author_name) unless owner
-
-    body :bugurl => url_for(:host => SERVER_URL,
-                            :controller => "browse",
-                            :action => "bug",
-                            :id => bug_comment.bug_id),
-         :place => bug_comment.map_bug.nearby_place,
-         :comment => bug_comment.body,
-         :owner => owner,
-         :commenter => bug_comment.author_name
+  def note_comment_notification(comment, recipient)
+    with_recipient_locale recipient do
+      @noteurl = browse_note_url(comment.note, :host => SERVER_URL)
+      @place = Nominatim.describe_location(comment.note.lat, comment.note.lon, 14, I18n.locale)
+      @comment = comment.body
+      @owner = recipient == comment.note.author
+      @event = comment.event
+
+      if comment.author
+        @commenter = comment.author.display_name
+      else
+        @commenter = I18n.t("notifier.note_comment_notification.anonymous")
+      end
+
+      if @owner
+        subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
+      else
+        subject = I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter)
+      end
+
+      mail :to => recipient.email, :subject => subject
+    end
+  end
+
+  def changeset_comment_notification(comment, recipient)
+    with_recipient_locale recipient do
+      @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
+      @comment = comment.body
+      @owner = recipient == comment.changeset.user
+      @commenter = comment.author.display_name
+      @changeset_comment = comment.changeset.tags['comment'].presence
+      @time = comment.created_at
+      @changeset_author = comment.changeset.user.display_name
+
+      if @owner
+        subject = I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
+      else
+        subject = I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
+      end
+
+      mail :to => recipient.email, :subject => subject
+    end

   end
 
 private
 
   end
 
 private
 

-  def common_headers(recipient)
-    recipients recipient.email
-    locale recipient.preferred_language_from(I18n.available_locales)
-    from EMAIL_FROM
-    headers "return-path" => EMAIL_RETURN_PATH,
-            "Auto-Submitted" => "auto-generated"
+  def with_recipient_locale(recipient)
+    old_locale = I18n.locale
+
+    begin
+      I18n.locale = recipient.preferred_language_from(I18n.available_locales)
+
+      yield
+    ensure
+      I18n.locale = old_locale
+    end

   end
 
   end
 

-  def from_header(name, type, id, digest)
-    if domain = MESSAGES_DOMAIN
-      from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")
+  def from_address(name, type, id, digest)
+    if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN
+      "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
+    else
+      EMAIL_FROM

     end
   end
 end
     end
   end
 end