The test train rolls ever onwards...

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index b1a94a77de0ccfe517edb96e9228f2eddef520d2..bc018cbe83c2ae81c8c7d464930e982fa87bc697 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,
                      :confirm_string => token.token)
 
       mail :to => user.email,

-           :subject => I18n.t('notifier.signup_confirm.subject')
+           :subject => I18n.t("notifier.signup_confirm.subject")

     end
   end
 
     end
   end
 


@@ -24,7 +24,7 @@ class Notifier < ActionMailer::Base
                      :confirm_string => token.token)
 
       mail :to => user.new_email,
                      :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
 
     end
   end
 


@@ -35,7 +35,7 @@ class Notifier < ActionMailer::Base
                      :token => token.token)
 
       mail :to => user.email,
                      :token => token.token)
 
       mail :to => user.email,

-           :subject => I18n.t('notifier.lost_password.subject')
+           :subject => I18n.t("notifier.lost_password.subject")

     end
   end
 
     end
   end
 


@@ -48,7 +48,7 @@ class Notifier < ActionMailer::Base
       @possible_points = possible_points
 
       mail :to => trace.user.email,
       @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
 
     end
   end
 


@@ -60,7 +60,7 @@ class Notifier < ActionMailer::Base
       @error = error
 
       mail :to => trace.user.email,
       @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
 
     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,
 
       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
 
     end
   end
 


@@ -109,7 +109,7 @@ class Notifier < ActionMailer::Base
 
       mail :from => from_address(comment.user.display_name, "c", comment.id, comment.digest),
            :to =>  comment.diary_entry.user.email,
 
       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)
+           :subject => I18n.t("notifier.diary_comment_notification.subject", :user => comment.user.display_name)

     end
   end
 
     end
   end
 


@@ -118,7 +118,7 @@ class Notifier < ActionMailer::Base
       @friend = friend
 
       mail :to => friend.befriendee.email,
       @friend = friend
 
       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
 
     end
   end
 


@@ -152,7 +152,7 @@ class Notifier < ActionMailer::Base
       @comment = comment.body
       @owner = recipient == comment.changeset.user
       @commenter = comment.author.display_name
       @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
 
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
 


@@ -166,7 +166,7 @@ class Notifier < ActionMailer::Base
     end
   end
 
     end
   end
 

-private
+  private

 
   def with_recipient_locale(recipient)
     old_locale = I18n.locale
 
   def with_recipient_locale(recipient)
     old_locale = I18n.locale


@@ -181,8 +181,8 @@ private
   end
 
   def from_address(name, type, id, digest)
   end
 
   def from_address(name, type, id, digest)

-    if Object.const_defined?(:MESSAGES_DOMAIN) and domain = MESSAGES_DOMAIN
-      "#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>"
+    if Object.const_defined?(:MESSAGES_DOMAIN) && domain = MESSAGES_DOMAIN
+      "#{name} <#{type}-#{id}-#{digest[0, 6]}@#{domain}>"

     else
       EMAIL_FROM
     end
     else
       EMAIL_FROM
     end