Include an [OpenStreetMap] prefix on the subject of message notifications

Put back the [OpenStreetMap] prefix to the subject line of email
notifications of messages, but strip it again from any incoming
email replies.

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index de0ad21d688a1a8fe67e7e6e34479c6c0fedd03e..f63d08b67abc4bda9ea779f2d68633610398573c 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -48,7 +48,7 @@ class Notifier < ActionMailer::Base
   def message_notification(message)
     common_headers message.recipient
     from_header message.sender.display_name, "m", message.id, message.digest
   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', :user => message.title, :locale => locale)

     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,
     body :to_user => message.recipient.display_name,
          :from_user => message.sender.display_name,
          :body => message.body,

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f79a3d9e5099cc847eb2bb0dbd7d99889f98490d..e3d8803ed28a3d23b88d33b15d3f44f6f6e414cd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1062,6 +1062,7 @@ en:
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
     message_notification:
       header: "{{from_user}} has commented on your recent OpenStreetMap diary entry with the subject {{subject}}:"
       footer: "You can also read the comment at {{readurl}} and you can comment at {{commenturl}} or reply at {{replyurl}}"
     message_notification:

+      subject_header: "[OpenStreetMap] {{subject}}"

       hi: "Hi {{to_user}},"
       header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
       footer1: "You can also read the message at {{readurl}}"
       hi: "Hi {{to_user}},"
       header: "{{from_user}} has sent you a message through OpenStreetMap with the subject {{subject}}:"
       footer1: "You can also read the message at {{readurl}}"

diff --git a/script/deliver-message b/script/deliver-message
index 3df09f85fdbde5cf396d55da6591072dfba2b78c..58afa3451af923e042426833bc8d14b7da0ec705 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -15,6 +15,7 @@ else
   digest = message.digest
   from = message.recipient
   to = message.sender
   digest = message.digest
   from = message.recipient
   to = message.sender

+  subject = message.subject.sub(/\[OpenStreetMap\] */, "")

 end
 
 exit 0 unless recipient[3] == digest[0,6]
 end
 
 exit 0 unless recipient[3] == digest[0,6]


@@ -23,7 +24,7 @@ mail = TMail::Mail.parse(STDIN.readlines.join)
 
 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => Time.now.getutc,
 
 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => Time.now.getutc,

-                      :title => mail.subject,
+                      :title => subject,

                       :body => mail.body)
 message.save!
 
                       :body => mail.body)
 message.save!