diff options
| author | Robin Houston <robin@lenny.robin> | 2011-07-14 00:28:34 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-07-14 00:28:34 +0100 |
| commit | 0560d4fd4287db43c99108a5acdf573d70f81044 (patch) | |
| tree | 65065798eea9a96da6bf87333392832a68eec2c9 | |
| parent | 90762dc83d845a584db0399994bbb51066213249 (diff) | |
| parent | 13327a90808e56ffe84f083b13a0782bd3c0bda9 (diff) | |
Merge branch 'master' into wdtk
| -rw-r--r-- | app/views/request_mailer/old_unclassified_updated.rhtml | 2 | ||||
| -rw-r--r-- | app/views/request_mailer/overdue_alert.rhtml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/request_mailer/old_unclassified_updated.rhtml b/app/views/request_mailer/old_unclassified_updated.rhtml index b03780016..afaa0cf1c 100644 --- a/app/views/request_mailer/old_unclassified_updated.rhtml +++ b/app/views/request_mailer/old_unclassified_updated.rhtml @@ -1,7 +1,7 @@ <%= _('To help us keep the site tidy, someone else has updated the status of the {{law_used_full}} request {{title}} that you made to {{public_body}}, to "{{display_status}}" If you disagree with their categorisation, please update the status again yourself to what you believe to be more accurate.',:law_used_full=>@info_request.law_used_full,:title=>@info_request.title, :public_body=>@info_request.public_body.name,:display_status=>@info_request.display_status.downcase)%> -<%=_ ('Follow this link to see the request:')%> +<%=_('Follow this link to see the request:')%> <%= @url %> diff --git a/app/views/request_mailer/overdue_alert.rhtml b/app/views/request_mailer/overdue_alert.rhtml index 65ae207a2..70b6ffcf1 100644 --- a/app/views/request_mailer/overdue_alert.rhtml +++ b/app/views/request_mailer/overdue_alert.rhtml @@ -1,6 +1,6 @@ <%= @info_request.public_body.name %> <%= _('have delayed.')%> -<%=_ ('They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law',:law_used_short=>@info_request.law_used_short,:title=>@info_request.title)%><% if @info_request.public_body.is_school? %> <%=_ ('during term time')%> <% end %>. +<%= _('They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law',:law_used_short=>@info_request.law_used_short,:title=>@info_request.title)%><% if @info_request.public_body.is_school? %> <%=_('during term time')%> <% end %>. <%= _('Click on the link below to send a message to {{public_body}} reminding them to reply to your request.',:public_body=>@info_request.public_body.name)%> |