diff options
author | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
---|---|---|
committer | seb <seb@seb-U36JC> | 2011-11-24 09:21:36 +0000 |
commit | a4e533f1588a5d34dca4ab462b58ddd83eed37c5 (patch) | |
tree | 58bb3b57ec5664e094ae151c18b6c1915256e364 /app/models/outgoing_message.rb | |
parent | d473fce1d0451c913d3ef697d3b45bd58c6fff54 (diff) | |
parent | e649c2a7f19d0a75206149d886ff47b3ccda4e91 (diff) |
Merge branch 'develop' into xapian-dcabo
Conflicts:
spec/models/xapian_spec.rb
Diffstat (limited to 'app/models/outgoing_message.rb')
-rw-r--r-- | app/models/outgoing_message.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index c7ba362e0..b7e310b1e 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -54,14 +54,15 @@ class OutgoingMessage < ActiveRecord::Base # How the default letter starts and ends def get_salutation - ret = _("Dear ") + ret = "" if self.message_type == 'followup' && !self.incoming_message_followup.nil? && !self.incoming_message_followup.safe_mail_from.nil? && self.incoming_message_followup.valid_to_reply_to? ret = ret + OutgoingMailer.name_for_followup(self.info_request, self.incoming_message_followup) else ret = ret + self.info_request.public_body.name end - return ret + "," + salutation = _("Dear {{public_body_name}},", :public_body_name => ret) end + def get_signoff if self.message_type == 'followup' && !self.incoming_message_followup.nil? && !self.incoming_message_followup.safe_mail_from.nil? && self.incoming_message_followup.valid_to_reply_to? return _("Yours sincerely,") |