Remove comment saying when these files were generated

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 2313e97cefbe877e08d2e90304178c6b5df04427..35b521e1fdfdd4918f82f3aa604a97a4f7b331d4 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -22,13 +22,7 @@ class Notifier < ActionMailer::Base
     subject I18n.t('notifier.lost_password.subject')
     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "reset_password",
     subject I18n.t('notifier.lost_password.subject')
     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "reset_password",

-                         :email => user.email, :token => token.token)
-  end
-
-  def reset_password(user, pass)
-    common_headers user
-    subject I18n.t('notifier.reset_password.subject')
-    body :pass => pass
+                         :token => token.token)

   end
 
   def gpx_success(trace, possible_points)
   end
 
   def gpx_success(trace, possible_points)


@@ -53,7 +47,7 @@ class Notifier < ActionMailer::Base
   
   def message_notification(message)
     common_headers message.recipient
   
   def message_notification(message)
     common_headers message.recipient

-    subject I18n.t('notifier.message_notification.subject', :user => message.sender.display_name)
+    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,
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,


@@ -97,7 +91,7 @@ class Notifier < ActionMailer::Base
     befriendee = User.find_by_id(friend.friend_user_id)
 
     common_headers befriendee
     befriendee = User.find_by_id(friend.friend_user_id)
 
     common_headers befriendee

-    subject I18n.t('notifier.friend_notification.subject', :user => befriender.display_name)
+    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",
     body :user => befriender.display_name,
          :userurl => url_for(:host => SERVER_URL,
                              :controller => "user", :action => "view",