diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/outgoing_message.rb | 5 | ||||
| -rw-r--r-- | app/views/request/new_bad_contact.rhtml | 4 |
2 files changed, 5 insertions, 4 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,") diff --git a/app/views/request/new_bad_contact.rhtml b/app/views/request/new_bad_contact.rhtml index 41a2cef4d..56f3f4168 100644 --- a/app/views/request/new_bad_contact.rhtml +++ b/app/views/request/new_bad_contact.rhtml @@ -3,8 +3,8 @@ <h1><%=@title%></h1> <p><%= _('Unfortunately, we do not have a working {{info_request_law_used_full}} -address for'),:info_request_law_used_full => @info_request.law_used_full %> <%=h @info_request.public_body.name %>. <%= _('You may be able to find +address for', :info_request_law_used_full => @info_request.law_used_full) %> <%=h @info_request.public_body.name %>. <%= _('You may be able to find one on their website, or by phoning them up and asking. If you manage -to find one, then please <a href="%s">send it to us</a>.') % [help_contact_path] %> +to find one, then please <a href="{{help_url}}">send it to us</a>.', :help_url => help_contact_path) %> </p> |