Update name of test

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index be7b8d145ee2832df789127b70b3654346f374c9..23f7b990781049948036d08842bcec877b0250ad 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -12,7 +12,7 @@ class Notifier < ActionMailer::Base
                      :confirm_string => token.token)
 
       mail :to => user.email,
-           :subject => I18n.t('notifier.signup_confirm.subject')
+           :subject => I18n.t("notifier.signup_confirm.subject")
     end
   end
 
@@ -24,7 +24,7 @@ class Notifier < ActionMailer::Base
                      :confirm_string => token.token)
 
       mail :to => user.new_email,
-           :subject => I18n.t('notifier.email_confirm.subject')
+           :subject => I18n.t("notifier.email_confirm.subject")
     end
   end
 
@@ -35,7 +35,7 @@ class Notifier < ActionMailer::Base
                      :token => token.token)
 
       mail :to => user.email,
-           :subject => I18n.t('notifier.lost_password.subject')
+           :subject => I18n.t("notifier.lost_password.subject")
     end
   end
 
@@ -48,7 +48,7 @@ class Notifier < ActionMailer::Base
       @possible_points = possible_points
 
       mail :to => trace.user.email,
-           :subject => I18n.t('notifier.gpx_notification.success.subject')
+           :subject => I18n.t("notifier.gpx_notification.success.subject")
     end
   end
 
@@ -60,7 +60,7 @@ class Notifier < ActionMailer::Base
       @error = error
 
       mail :to => trace.user.email,
-           :subject => I18n.t('notifier.gpx_notification.failure.subject')
+           :subject => I18n.t("notifier.gpx_notification.failure.subject")
     end
   end
 
@@ -79,7 +79,7 @@ class Notifier < ActionMailer::Base
 
       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)
+           :subject => I18n.t("notifier.message_notification.subject_header", :subject => message.title)
     end
   end
 
@@ -108,17 +108,23 @@ class Notifier < ActionMailer::Base
                           :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)
+           :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)
     with_recipient_locale friend.befriendee do
       @friend = friend
+      @viewurl = url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "view",
+                         :display_name => @friend.befriender.display_name)
+      @friendurl = url_for(:host => SERVER_URL,
+                           :controller => "user", :action => "make_friend",
+                           :display_name => @friend.befriender.display_name)
 
       mail :to => friend.befriendee.email,
-           :subject => I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name)
+           :subject => I18n.t("notifier.friend_notification.subject", :user => friend.befriender.display_name)
     end
   end
 
@@ -130,17 +136,17 @@ class Notifier < ActionMailer::Base
       @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
+      @commenter = if comment.author
+                     comment.author.display_name
+                   else
+                     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
+      subject = if @owner
+                  I18n.t("notifier.note_comment_notification.#{@event}.subject_own", :commenter => @commenter)
+                else
+                  I18n.t("notifier.note_comment_notification.#{@event}.subject_other", :commenter => @commenter)
+                end
 
       mail :to => recipient.email, :subject => subject
     end
@@ -152,15 +158,15 @@ class Notifier < ActionMailer::Base
       @comment = comment.body
       @owner = recipient == comment.changeset.user
       @commenter = comment.author.display_name
-      @changeset_comment = comment.changeset.tags['comment'].presence
+      @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
+      subject = if @owner
+                  I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
+                else
+                  I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter)
+                end
 
       mail :to => recipient.email, :subject => subject
     end
@@ -169,14 +175,8 @@ class Notifier < ActionMailer::Base
   private
 
   def with_recipient_locale(recipient)
-    old_locale = I18n.locale
-
-    begin
-      I18n.locale = recipient.preferred_language_from(I18n.available_locales)
-
+    I18n.with_locale Locale.available.preferred(recipient.preferred_languages) do
       yield
-    ensure
-      I18n.locale = old_locale
     end
   end