diff options
| author | David Cabo <david@calibea.com> | 2011-08-17 11:05:21 +0200 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2011-08-17 11:05:21 +0200 |
| commit | 817ce18d16d037aadc5ea44d93854c6e17f06747 (patch) | |
| tree | 1820f4a62c1060063e0b9751473eca9610142598 /app/models/outgoing_message.rb | |
| parent | 0ca78b7c2abfe28ef7acd7137fda5d82a973c2e1 (diff) | |
| parent | e1a2e1ad36c6b0c7bfac501eb2a0d0ae5efd05a1 (diff) | |
Merge branch 'fixes' into asktheeu
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,") |