7 files changed, 19 insertions, 20 deletions
diff --git a/app/views/request/_describe_state.rhtml b/app/views/request/_describe_state.rhtml
index 052833a67..71699835c 100644
--- a/app/views/request/_describe_state.rhtml
+++ b/app/views/request/_describe_state.rhtml
@@ -4,7 +4,7 @@
         <h2><%= _('What best describes the status of this request now?') %></h2>
 
         <hr> <!------------------------------------------------>
-	<h3>This request is still in progress:</h3>
+	<h3><%= _('This request is still in progress:') %></h3>
         <% if @info_request.described_state != 'internal_review' %>
             <div>
                 <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %>
@@ -41,7 +41,7 @@
         <%= render :partial => 'general/custom_state_transitions_pending', :locals => {:id_suffix => id_suffix } %>
 
         <hr> <!------------------------------------------------>
-	<h3>This particular request is finished:</h3>
+	<h3><%= _('This particular request is finished:') %></h3>
 
         <% if @info_request.described_state == 'internal_review' %>
             <p><%= _('The <strong>review has finished</strong> and overall:') %></p>
@@ -68,7 +68,7 @@
 
 
         <hr> <!------------------------------------------------>
-	<h3>Other:</h3>
+	<h3><%= _('Other:') %></h3>
 
         <div>
            <%= radio_button "incoming_message", "described_state", "error_message", :id => 'error_message' + id_suffix %>
diff --git a/app/views/request/_other_describe_state.rhtml b/app/views/request/_other_describe_state.rhtml
index 1c88f97f8..e274fe8c9 100644
--- a/app/views/request/_other_describe_state.rhtml
+++ b/app/views/request/_other_describe_state.rhtml
@@ -7,7 +7,7 @@
     Thanks.') %></h2>
 
     <hr> <!------------------------------------------------>
-    <h3>This request is still in progress:</h3>
+    <h3><%= _('This request is still in progress:') %></h3>
     <% if @info_request.described_state != 'internal_review' %>
         <div>
             <%= radio_button "incoming_message", "described_state", "waiting_response", :id => 'waiting_response' + id_suffix %>
@@ -37,7 +37,7 @@
     <%= render :partial => 'general/custom_state_transitions_pending', :locals => {:id_suffix => id_suffix } %>
 
     <hr> <!------------------------------------------------>
-    <h3>This particular request is finished:</h3>
+    <h3><%= _('This particular request is finished:') %></h3>
 
     <% if @info_request.described_state == 'internal_review' %>
         <p><%= _('The <strong>review has finished</strong> and overall:') %></p>
diff --git a/app/views/request/_view_html_prefix.rhtml b/app/views/request/_view_html_prefix.rhtml
index f425735cd..b29830ac7 100644
--- a/app/views/request/_view_html_prefix.rhtml
+++ b/app/views/request/_view_html_prefix.rhtml
@@ -1,6 +1,6 @@
 <div class="view_html_prefix">
     <div class="view_html_logo">
-        <a href="/"><img src="/images/navimg/logo-trans-small.png" alt="WhatDotheyKnow?"></a>
+        <a href="/"><img src="/images/navimg/logo-trans-small.png" alt="<%= site_name %>"></a>
     </div>
     <div class="view_html_download_link">
         <%=link_to _("Download original attachment"), @attachment_url %> 
diff --git a/app/views/request/details.rhtml b/app/views/request/details.rhtml
index 94d87306d..d4c63902f 100644
--- a/app/views/request/details.rhtml
+++ b/app/views/request/details.rhtml
@@ -4,17 +4,17 @@
 <h2><%= _('Event history') %></h2>
 
 <p><%= _('This table shows the technical details of the internal events that happened
-to this request on WhatDoTheyKnow. This could be used to generate information about
+to this request on {{site_name}}. This could be used to generate information about
 the speed with which authorities respond to requests, the number of requests
-which require a postal response and much more.') %>
+which require a postal response and much more.', :site_name=>site_name) %>
 </p>
 
 <p><%= _('<strong>Caveat emptor!</strong> To use this data in an honourable way, you will need 
-a good internal knowledge of user behaviour on WhatDoTheyKnow. How, 
+a good internal knowledge of user behaviour on {{site_name}}. How, 
 why and by whom requests are categorised is not straightforward, and there will
 be user error and ambiguity. You will also need to understand FOI law, and the
 way authorities use it. Plus you\'ll need to be an elite statistician.  Please
-<a href="%s">contact us</a> with questions.') % [help_contact_path] %>
+<a href="{{contact_path}}">contact us</a> with questions.', :site_name=>site_name, :contact_path=>help_contact_path) %>
 </p>
 
 <% columns = ['id', 'event_type', 'created_at', 'described_state', 'calculated_state', 'last_described_at' ] %>
@@ -49,11 +49,12 @@ way authorities use it. Plus you\'ll need to be an elite statistician.  Please
 <p>
 <%= _('Here <strong>described</strong> means when a user selected a status for the request, and
 the most recent event had its status updated to that value. <strong>calculated</strong> is then inferred by
-WhatDoTheyKnow for intermediate events, which weren\'t given an explicit
-description by a user. See the <a href="%s">search tips</a> for description of the states.') % [search_redirect_path] %>
+{{site_name}} for intermediate events, which weren\'t given an explicit
+description by a user. See the <a href="{{search_path}}">search tips</a> for description of the states.',
+:site_name=>site_name, :search_path=>search_redirect_path) %>
 </p>
 
 <p>
 <%= _('You can get this page in computer-readable format as part of the main JSON
-page for the request.  See the <a href="%s">API documentation</a>.') % [help_api_path] %>
+page for the request.  See the <a href="{{api_path}}">API documentation</a>.', :api_path=>help_api_path) %>
 </p>
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>
 
diff --git a/app/views/request/show.rhtml b/app/views/request/show.rhtml
index 1993ee6b2..2897a3564 100644
--- a/app/views/request/show.rhtml
+++ b/app/views/request/show.rhtml
@@ -110,9 +110,9 @@
     <% elsif @status == 'internal_review' %>
 		<%= _('Waiting for an <strong>internal review</strong> by {{public_body_link}} of their handling of this request.',:public_body_link=>public_body_link(@info_request.public_body)) %>
     <% elsif @status == 'error_message' %>
-        <%= _('There was a <strong>delivery error</strong> or similar, which needs fixing by the WhatDoTheyKnow team.') %>
+        <%= _('There was a <strong>delivery error</strong> or similar, which needs fixing by the {{site_name}} team.', :site_name=>site_name) %>
     <% elsif @status == 'requires_admin' %>
-        <%= _('This request has had an unusual response, and <strong>requires attention</strong> from the WhatDoTheyKnow team.') %>
+        <%= _('This request has had an unusual response, and <strong>requires attention</strong> from the {{site_name}} team.', :site_name=>site_name) %>
     <% elsif @status == 'user_withdrawn' %>
         <%= _('This request has been <strong>withdrawn</strong> by the person who made it. 
         	   There may be an explanation in the correspondence below.') %>
diff --git a/app/views/request/show_response.rhtml b/app/views/request/show_response.rhtml
index 40c3b3d5b..d8647d1ec 100644
--- a/app/views/request/show_response.rhtml
+++ b/app/views/request/show_response.rhtml
@@ -19,9 +19,7 @@
             address</strong>, not just an email, for it to be a valid FOI request') %>
         </dt>
         <dd>
-            <%= _('The law, the Ministry of Justice and the Information Commissioner
-            all say that an email is sufficient (<a href="%s">more details</a>).
-            At the bottom of this page, write a reply to the authority explaining this to them.') % [help_privacy_path + '#full_address'] %>
+            <%= render :partial => 'help/why_they_should_reply_by_email', :locals => {:help_page_url =>  help_privacy_path } %>
         </dd>
 
         <dt>