3 files changed, 15 insertions, 8 deletions
diff --git a/app/views/public_body/_list_sidebar_extra.rhtml b/app/views/public_body/_list_sidebar_extra.rhtml
new file mode 100644
index 000000000..6857a7eb5
--- /dev/null
+++ b/app/views/public_body/_list_sidebar_extra.rhtml
@@ -0,0 +1,6 @@
+<p>
+  <%= _('<a href="%s">Are we missing a public authority?</a>') % [help_requesting_path + '#missing_body'] %>
+</p>
+<p>
+  <%= link_to _('List of all authorities (CSV)'), all_public_bodies_csv_url() %>
+</p>
diff --git a/app/views/public_body/list.rhtml b/app/views/public_body/list.rhtml
index 8cb207bd4..3a64de1f7 100644
--- a/app/views/public_body/list.rhtml
+++ b/app/views/public_body/list.rhtml
@@ -25,15 +25,10 @@
     <% if not first_row %>
 	    </ul>
     <% end %>
-    <p>
-	<%= _('<a href="%s">Are we missing a public authority?</a>.') % [help_requesting_path + '#missing_body'] %>
-    </p>
-    <p>
-      <%= link_to _('List of all authorities (CSV)'), all_public_bodies_csv_url() %>
-    </p>
+    <%= render :partial => "list_sidebar_extra" %>
 </div>
 
-<% @title = _("Public authorities - {{description}}", :description => @description) %>
+<% @title = @description.empty? ? _("Public authorities") : _("Public authorities - {{description}}", :description => @description) %>
 <div id="left_column_flip">
 <h1><%= _('Public authorities') %></h1>
 
@@ -44,7 +39,7 @@
  </div>
 <% end %>
 
-<h2 class="publicbody_results"><%= _('Found {{count}} public bodies {{description}}', :count=>@public_bodies.total_entries, :description=>@description) %></h2>
+<h2 class="publicbody_results"><%= n_('Found %d public authority %s', 'Found %d public authorities %s', @public_bodies.total_entries) % [@public_bodies.total_entries, @description] %></h2>
 <%= render :partial => 'body_listing', :locals => { :public_bodies => @public_bodies } %>
 
   <%= will_paginate(@public_bodies) %><br/>
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index 63bd5f7fc..b56556d5d 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -64,6 +64,12 @@
             <% else %>
                 <%= _('For an unknown reason, it is not possible to make a request to this authority.')%>
             <% end %>
+
+            <% if @public_body.override_request_email %>
+                <p>
+                    <%= _("<strong>Note:</strong> Because we're testing, requests are being sent to {{email}} rather than to the actual authority.", :email => @public_body.override_request_email) %>
+                </p>
+            <% end %>
         </div>
     </div>