X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d9dbd3edf16335ffd6b9d57d63f55ca98fdc292c..73340e1780bfee7b3ebfd17f9fa204647ea40d34:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 9793caee7..35b521e1f 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -22,18 +22,12 @@ class Notifier < ActionMailer::Base
     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)
     common_headers trace.user
-    subject "[OpenStreetMap] GPX Import success"
+    subject I18n.t('notifier.gpx_notification.success.subject')
     body :trace_name => trace.name,
          :trace_points => trace.size,
          :trace_description => trace.description,
@@ -44,7 +38,7 @@ class Notifier < ActionMailer::Base
   def gpx_failure(trace, error)
     common_headers trace.user
     from "webmaster@openstreetmap.org"
-    subject "[OpenStreetMap] GPX Import failure"
+    subject I18n.t('notifier.gpx_notification.failure.subject')
     body :trace_name => trace.name,
          :trace_description => trace.description,
          :trace_tags => trace.tags,
@@ -53,7 +47,7 @@ class Notifier < ActionMailer::Base
   
   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,
@@ -68,7 +62,7 @@ class Notifier < ActionMailer::Base
 
   def diary_comment_notification(comment)
     common_headers comment.diary_entry.user
-    subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name)
+    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,
@@ -97,7 +91,7 @@ class Notifier < ActionMailer::Base
     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",