0
@@ -12,21 +12,21 @@
0
   def password_reminder(person)
0
     from         "Password reminder <password-reminder@#{server}>"
0
     recipients   person.email
0
-    subject      "Password reminder"
0
+    subject      formatted_subject("Password reminder")
0
     body         "domain" => server, "person" => person
0
   end
0
   
0
   def message_notification(message)
0
     from         "Message notification <message@#{server}>"
0
     recipients   message.recipient.email
0
-    subject      "New message"
0
+    subject      formatted_subject("New message")
0
     body         "domain" => server, "message" => message
0
   end
0
   
0
   def connection_request(connection)
0
     from         "Contact request <connection@#{server}>"
0
     recipients   connection.contact.email
0
-    subject      "New contact request"
0
+    subject      formatted_subject("New contact request")
0
     body         "domain" => server,
0
                  "connection" => connection,
0
                  "url" => edit_connection_path(connection),
0
@@ -36,7 +36,7 @@
0
   def blog_comment_notification(comment)
0
     from         "Comment notification <comment@#{server}>"
0
     recipients   comment.commented_person.email
0
-    subject      "New blog comment"
0
+    subject      formatted_subject("New blog comment")
0
     body         "domain" => server, "comment" => comment,
0
                  "url" => 
0
                  blog_post_path(comment.commentable.blog, comment.commentable),
0
@@ -47,7 +47,7 @@
0
   def wall_comment_notification(comment)
0
     from         "Comment notification <comment@#{server}>"
0
     recipients   comment.commented_person.email
0
-    subject      "New blog comment"
0
+    subject      formatted_subject("New wall comment")
0
     body         "domain" => server, "comment" => comment,
0
                  "url" => person_path(comment.commentable, :anchor => "wall"),
0
                  "preferences_note" => 
0
0
0
@@ -55,16 +55,21 @@
0
   end
0
   
0
   def email_verification(ev)
0
-    name = PersonMailer.global_prefs.app_name
0
-    label = name.nil? || name.blank? ? "" : "[#{name}] "
0
     from         "Email verification <email@#{server}>"
0
     recipients   ev.person.email
0
-    subject      "#{label}Email verification"
0
+    subject      formatted_subject("Email verification")
0
     body         "server_name" => server,
0
                  "code" => ev.code
0
   end
0
   
0
   private
0
+  
0
+    # Prepend the application name to subjects if present in preferences.
0
+    def formatted_subject(text)
0
+      name = PersonMailer.global_prefs.app_name
0
+      label = name.blank? ? "" : "[#{name}] "
0
+      "#{label}#{text}"
0
+    end
0
   
0
     def preferences_note(person)
0
       %(To change your email notification preferences, visit

0
@@ -3,6 +3,7 @@
0
 one:
0
   domain: example.com
0
   server_name: server.example.net
0
+  app_name: Example
0
   smtp_server: smtp.example.com
0
   email_notifications: true
0
   email_verifications: false

0
@@ -149,6 +149,10 @@
0
        @email.to.first.should == @ev.person.email
0
      end
0
      
0
+     it "should have the right subject" do
0
+       @email.subject.should == "[Example] Email verification"
0
+     end
0
+     
0
      it "should have a URL to the verification page" do
0
        url = "http://#{@server}/people/verify/#{@ev.code}"
0
        @email.body.should =~ /#{url}/