X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/eefb42334f6d928081d5d5edbb92e75813666dbb..6d5c551a7c0c7002acdc62eb9ec1041866da6f84:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index de0ad21d6..e6058d4b7 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,6 +4,7 @@ class Notifier < ActionMailer::Base
     subject I18n.t('notifier.signup_confirm.subject')
     body :url => url_for(:host => SERVER_URL,
                          :controller => "user", :action => "confirm",
+                         :display_name => user.display_name,
                          :confirm_string => token.token)
   end
 
@@ -48,7 +49,7 @@ class Notifier < ActionMailer::Base
   def message_notification(message)
     common_headers message.recipient
     from_header message.sender.display_name, "m", message.id, message.digest
-    subject message.title
+    subject I18n.t('notifier.message_notification.subject_header', :subject => message.title, :locale => locale)
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,
@@ -105,7 +106,7 @@ private
   end
 
   def from_header(name, type, id, digest)
-    if domain = APP_CONFIG['messages_domain']
+    if domain = MESSAGES_DOMAIN
       from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")
     end
   end