merge from master and make tests pass

1 files changed, 2 insertions, 2 deletions

diff --git a/app/models/user_mailer.rb b/app/models/user_mailer.rb
index f164f684e..0972e167d 100644
--- a/app/models/user_mailer.rb
+++ b/app/models/user_mailer.rb
@@ -31,7 +31,7 @@ class UserMailer < ApplicationMailer
         @from = contact_from_name_and_email
         headers 'Return-Path' => blackhole_email, 'Reply-To' => @from # we don't care about bounces when people are fiddling with their account
         @recipients = new_email
-        @subject    = _("Confirm your new email address on WhatDoTheyKnow.com")
+        @subject    = _("Confirm your new email address on {{site_name}}", :site_name=>site_name)
         @body[:name] = user.name
         @body[:url] = url
         @body[:old_email] = user.email
@@ -42,7 +42,7 @@ class UserMailer < ApplicationMailer
         @from = contact_from_name_and_email
         headers 'Return-Path' => blackhole_email, 'Reply-To' => @from # we don't care about bounces when people are fiddling with their account
         @recipients = new_email
-        @subject    = _("Unable to change email address on WhatDoTheyKnow.com")
+        @subject    = _("Unable to change email address on {{site_name}}", :site_name=>site_name)
         @body[:old_email] = old_email
         @body[:new_email] = new_email
     end