aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/views/comment/_single_comment.rhtml2
-rw-r--r--app/views/layouts/default.rhtml1
-rw-r--r--app/views/public_body/view_email.rhtml2
-rw-r--r--app/views/request/_after_actions.rhtml4
-rw-r--r--app/views/request_mailer/new_response.rhtml2
-rw-r--r--app/views/request_mailer/overdue_alert.rhtml4
-rw-r--r--app/views/request_mailer/stopped_responses.rhtml2
-rw-r--r--app/views/request_mailer/very_overdue_alert.rhtml4
-rw-r--r--app/views/track_mailer/event_digest.rhtml17
9 files changed, 18 insertions, 20 deletions
diff --git a/app/views/comment/_single_comment.rhtml b/app/views/comment/_single_comment.rhtml
index 5b37db41a..e6a1728a8 100644
--- a/app/views/comment/_single_comment.rhtml
+++ b/app/views/comment/_single_comment.rhtml
@@ -7,7 +7,7 @@
<h2>
<%# When not logged in, but mid-comment-leaving, there'll be no comment.user %>
- <%= comment.user ? user_link(comment.user) : _("You") %> <%= _("left an annotation") (<%= simple_date(comment.created_at || Time.now) %>)
+ <%= comment.user ? user_link(comment.user) : _("You") %> <%= _("left an annotation") %> (<%= simple_date(comment.created_at || Time.now) %>)
</h2>
<div class="comment_in_request_text">
<p>
diff --git a/app/views/layouts/default.rhtml b/app/views/layouts/default.rhtml
index be302103a..aa532e481 100644
--- a/app/views/layouts/default.rhtml
+++ b/app/views/layouts/default.rhtml
@@ -28,7 +28,6 @@
<style type="text/css">@import url("/stylesheets/ie6-custom.css");</style>
<![endif]-->
<%= stylesheet_link_tag 'main-custom', :title => "Main", :rel => "stylesheet" %>
- <link href="http://127.0.0.1:3000/custom.css" media="screen" rel="stylesheet" type="text/css">
<% if @feed_autodetect %>
<% for feed in @feed_autodetect %>
diff --git a/app/views/public_body/view_email.rhtml b/app/views/public_body/view_email.rhtml
index 8725930b8..d6c8d85fe 100644
--- a/app/views/public_body/view_email.rhtml
+++ b/app/views/public_body/view_email.rhtml
@@ -4,7 +4,7 @@
<p>
<% if @public_body.is_requestable? %>
-<%= _('WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for this authority.':request_email=> h(@public_body.request_email))%>
+<%= _('WhatDoTheyKnow sends new requests to <strong>{{request_email}}</strong> for this authority.',:request_email=> h(@public_body.request_email))%>
<% else %>
<% if @public_body.not_requestable_reason == 'not_apply' %>
<p><%= _('Freedom of Information law no longer applies to this authority.Follow up messages to existing requests are sent to ')%><strong><%=h @public_body.request_email%></strong>.
diff --git a/app/views/request/_after_actions.rhtml b/app/views/request/_after_actions.rhtml
index a62724df6..797ecaea5 100644
--- a/app/views/request/_after_actions.rhtml
+++ b/app/views/request/_after_actions.rhtml
@@ -21,10 +21,10 @@
<ul>
<li>
<% if @last_response.nil? %>
- <%= link_to _("Send follow up to ") + OutgoingMailer.name_for_followup(@info_request, @last_response), show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "#followup" %>
+ <%= link_to "Send follow up to " + OutgoingMailer.name_for_followup(@info_request, @last_response), show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "#followup" %>
<% else %>
<% foi_cache(:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => @last_response.id, :only_path => true, :template => "_after_actions", :section => "reply_to_link") do %>
- <%= link_to _("Reply to ") + OutgoingMailer.name_for_followup(@info_request, @last_response), show_response_url(:id => @info_request.id, :incoming_message_id => @last_response.id) + "#followup" %>
+ <%= link_to "Reply to " + OutgoingMailer.name_for_followup(@info_request, @last_response), show_response_url(:id => @info_request.id, :incoming_message_id => @last_response.id) + "#followup" %>
<% end %>
<% end %>
</li>
diff --git a/app/views/request_mailer/new_response.rhtml b/app/views/request_mailer/new_response.rhtml
index 6d2892f19..2c58d154e 100644
--- a/app/views/request_mailer/new_response.rhtml
+++ b/app/views/request_mailer/new_response.rhtml
@@ -7,7 +7,7 @@
<%=@url%>
<%= _('When you get there, please update the status to say if the response
-contains any useful information.' )%
+contains any useful information.' )%>
<%= _('Although all responses are automatically published, we depend on
you, the original requester, to evaluate them.')%>
diff --git a/app/views/request_mailer/overdue_alert.rhtml b/app/views/request_mailer/overdue_alert.rhtml
index a8bc76068..13f3e2853 100644
--- a/app/views/request_mailer/overdue_alert.rhtml
+++ b/app/views/request_mailer/overdue_alert.rhtml
@@ -1,8 +1,8 @@
<%= @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)%>
+<%= _('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)%>
<%=@url%>
diff --git a/app/views/request_mailer/stopped_responses.rhtml b/app/views/request_mailer/stopped_responses.rhtml
index bd8e54929..7032468e9 100644
--- a/app/views/request_mailer/stopped_responses.rhtml
+++ b/app/views/request_mailer/stopped_responses.rhtml
@@ -1,6 +1,6 @@
<%= _('The email that you, on behalf of {{public_body}}, sent to
{{user}} to reply to an {{law_used_short}}
-request has not been delivered.': public_body=>@info_request.public_body.name,:user=>@info_request.user.name:law_used_short@info_request.law_used_short)%>
+request has not been delivered.',:public_body=>@info_request.public_body.name,:user=>@info_request.user.name,:law_used_short=>@info_request.law_used_short)%>
<%= _('This is because {{title}} is an old request that has been
marked to no longer receive responses.',:title=>@info_request.title)%>
diff --git a/app/views/request_mailer/very_overdue_alert.rhtml b/app/views/request_mailer/very_overdue_alert.rhtml
index f9f51ee56..06a418a15 100644
--- a/app/views/request_mailer/very_overdue_alert.rhtml
+++ b/app/views/request_mailer/very_overdue_alert.rhtml
@@ -3,8 +3,8 @@
<%= _('They have not replied to your {{law_used_short}} request {{title}},
as required by law',:law_used_short=>@info_request.law_used_short,:title=>@info_request.title)%><% if @info_request.public_body.is_school? %> <%= _('even during holidays')%><% end %>.
-<%= _('Click on the link below to send a message to {{public_body.name}} telling them to reply to your request. You might like to ask for an internal
-review, asking them to find out why response to the request has been so slow.',:public_body=>@info_request.public_body.name)%>
+<%= _('Click on the link below to send a message to {{public_body_name}} telling them to reply to your request. You might like to ask for an internal
+review, asking them to find out why response to the request has been so slow.',:public_body_name=>@info_request.public_body.name)%>
<%=@url%>
diff --git a/app/views/track_mailer/event_digest.rhtml b/app/views/track_mailer/event_digest.rhtml
index f2da454a6..e40dd5d3f 100644
--- a/app/views/track_mailer/event_digest.rhtml
+++ b/app/views/track_mailer/event_digest.rhtml
@@ -1,4 +1,4 @@
-<%
+<%
# Construct the main text of the mail
main_text = ''
for track_thing, alert_results, xapian_object in @email_about_things
@@ -18,17 +18,17 @@
# e.g. Julian Burgess sent a request to Royal Mail Group (15 May 2008)
if event.event_type == 'response'
url = main_url(incoming_message_url(event.incoming_message))
- main_text += event.info_request.public_body.name + <%= _('sent a response to')%>+ event.info_request.user.name
+ main_text += event.info_request.public_body.name + " sent a response to " + event.info_request.user.name
elsif event.event_type == 'followup_sent'
url = main_url(outgoing_message_url(event.outgoing_message))
- main_text += event.info_request.user.name + <%= _('sent a follow up message to')%> + event.info_request.public_body.name
+ main_text += event.info_request.user.name + " sent a follow up message to " + event.info_request.public_body.name
elsif event.event_type == 'sent'
# this is unlikely to happen in real life, but happens in the test code
url = main_url(outgoing_message_url(event.outgoing_message))
- main_text += event.info_request.user.name + <%= _(' sent a request to')%> + event.info_request.public_body.name
+ main_text += event.info_request.user.name + " sent a request to " + event.info_request.public_body.name
elsif event.event_type == 'comment'
url = main_url(comment_url(event.comment))
- main_text += event.comment.user.name + <%= _('added an annotation')%>
+ main_text += event.comment.user.name + " added an annotation"
else
raise "unknown type in event_digest " + event.event_type
end
@@ -51,7 +51,7 @@
main_text += url + "\n"
main_text += "\n"
else
- raise <%= _('need to add other types to TrackMailer.event_digest')%>
+ raise "need to add other types to TrackMailer.event_digest"
end
end
main_text += "\n"
@@ -59,11 +59,10 @@
#STDERR.puts main_text
#STDERR.puts @unsubscribe_url
-%>
-<%=main_text%><%= _('Alter your subscription')%>
+%><%=main_text%>Alter your subscription
=======================
-<%= _('Please click on the link below to cancel or alter these emails.')%>
+Please click on the link below to cancel or alter these emails.
<%=@unsubscribe_url%>
-- the WhatDoTheyKnow team
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-30 18:12:57 +0000