Rename subject translation key, for consistency

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index e0f3bb5f6e0a7968fac3f37c4be8681b9177f366..bb4412e8a1927e4d702f3eeed884e785d51dc8db 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -83,7 +83,7 @@ class UserMailer < ApplicationMailer
 
       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("user_mailer.message_notification.subject_header", :subject => message.title)
+           :subject => t(".subject", :message_title => message.title)

     end
   end
 
     end
   end
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c7613cfd4f2c9692df1fef1718bffb897140f2b8..8ceb04f8e4f8a42894817f91f2a829b5e5d45c5d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1416,7 +1416,7 @@ en:
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
     message_notification:
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"
     message_notification:

-      subject_header: "[OpenStreetMap] %{subject}"
+      subject: "[OpenStreetMap] %{message_title}"

       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
       footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"