7 files changed, 14 insertions, 9 deletions
diff --git a/app/views/general/_frontpage_bodies_list.html.erb b/app/views/general/_frontpage_bodies_list.html.erb
index 44321f14a..1c35c55ad 100644
--- a/app/views/general/_frontpage_bodies_list.html.erb
+++ b/app/views/general/_frontpage_bodies_list.html.erb
@@ -3,9 +3,10 @@
   <div id="examples_0">
     <h3><%= _("Who can I request information from?") %></h3>
     <%= _("{{site_name}} covers requests to {{number_of_authorities}} authorities, including:",
-        :site_name => site_name, :number_of_authorities => PublicBody.visible.count) %>
+        :site_name => site_name,
+        :number_of_authorities => number_with_delimiter(PublicBody.visible.count)) %>
     <ul>
-        <% for popular_body in popular_bodies %>
+        <% popular_bodies.each do |popular_body| %>
             <li><%=public_body_link(popular_body)%>
              <%= n_('{{count}} request', '{{count}} requests', popular_body.info_requests_count, :count => popular_body.info_requests_count) %>
             </li>
diff --git a/app/views/general/_frontpage_new_request.html.erb b/app/views/general/_frontpage_new_request.html.erb
index 499b60eb5..5b987b320 100644
--- a/app/views/general/_frontpage_new_request.html.erb
+++ b/app/views/general/_frontpage_new_request.html.erb
@@ -4,4 +4,4 @@
   Information<br/>
   request</strong>") %>
 </h1>
-<a class="link_button_green_large" href="<%= select_authority_path %>"><%= _("Start now &raquo;") %></a>
+<a class="link_button_green_large" href="<%= select_authority_path %>"><%= _("Make a request &raquo;") %></a>
diff --git a/app/views/general/_frontpage_requests_list.html.erb b/app/views/general/_frontpage_requests_list.html.erb
index d7d9184c4..39187f3f0 100644
--- a/app/views/general/_frontpage_requests_list.html.erb
+++ b/app/views/general/_frontpage_requests_list.html.erb
@@ -8,9 +8,10 @@
     <% end %>
   </h3>
    <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:",
-    :site_name => site_name, :number_of_requests => InfoRequest.visible.count) %>
+    :site_name => site_name,
+    :number_of_requests => number_with_delimiter(InfoRequest.visible.count)) %>
     <ul>
-      <% for event in @request_events %>
+      <% @request_events.each do |event| %>
         <li>
           <% if @request_events_all_successful %>
             <%= _("{{public_body_link}} answered a request about",
diff --git a/app/views/general/_frontpage_search_box.html.erb b/app/views/general/_frontpage_search_box.html.erb
index 890602416..f77bd97fc 100644
--- a/app/views/general/_frontpage_search_box.html.erb
+++ b/app/views/general/_frontpage_search_box.html.erb
@@ -2,7 +2,8 @@
   <%= _("Search over<br/>
   <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>
   <strong>{{number_of_authorities}} authorities</strong>",
-  :number_of_requests => InfoRequest.visible.count, :number_of_authorities => PublicBody.visible.count) %>
+  :number_of_requests => number_with_delimiter(InfoRequest.visible.count),
+  :number_of_authorities => number_with_delimiter(PublicBody.visible.count)) %>
 </h2>
 <form id="search_form" method="post" action="<%= search_redirect_path %>">
   <div>
diff --git a/app/views/general/_locale_switcher.html.erb b/app/views/general/_locale_switcher.html.erb
index a318f61f3..7b6377665 100644
--- a/app/views/general/_locale_switcher.html.erb
+++ b/app/views/general/_locale_switcher.html.erb
@@ -1,7 +1,7 @@
  <% if FastGettext.default_available_locales.length > 1 && !params.empty? %>
    <div id="user_locale_switcher">
      <div class="btn-group">
-     <% for possible_locale in FastGettext.default_available_locales %>
+     <% FastGettext.default_available_locales.each do |possible_locale| %>
       <% if possible_locale == FastGettext.locale %>
         <a href="#" class="btn disabled"><%= locale_name(possible_locale) %></a>
       <% else %>
diff --git a/app/views/general/_responsive_topnav.html.erb b/app/views/general/_responsive_topnav.html.erb
index e726c17f4..0ece0da9a 100644
--- a/app/views/general/_responsive_topnav.html.erb
+++ b/app/views/general/_responsive_topnav.html.erb
@@ -6,7 +6,7 @@
         </li>
 
         <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>">
-          <%= link_to _("View requests"), request_list_successful_path %>
+          <%= link_to _("Browse requests"), request_list_successful_path %>
         </li>
 
         <li class="<%= 'selected' if params[:controller] == 'public_body' %>">
diff --git a/app/views/general/_topnav.html.erb b/app/views/general/_topnav.html.erb
index d37bd97d1..04ca07fa9 100644
--- a/app/views/general/_topnav.html.erb
+++ b/app/views/general/_topnav.html.erb
@@ -2,7 +2,9 @@
     <ul id="navigation">
         <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] != 'blog' and params[:action] != 'search' %>"><%= link_to _("Home"), frontpage_path %></li>
         <li class="<%= 'selected' if params[:controller] == 'request' and ['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("Make a request"), select_authority_path, :id => 'make-request-link' %></li>
-        <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>"><%= link_to _("View requests"), request_list_successful_path %></li>
+        <li class="<%= 'selected' if params[:controller] == 'request' and !['new', 'select_authority'].include?(params[:action]) %>">
+            <%= link_to _("Browse requests"), request_list_successful_path %>
+        </li>
         <li class="<%= 'selected' if params[:controller] == 'public_body' %>"><%= link_to _("View authorities"), list_public_bodies_default_path %></li>
 <% unless AlaveteliConfiguration::blog_feed.empty? %>
         <li class="<%= 'selected' if params[:controller] == 'general' and params[:action] == 'blog' %>"><%= link_to _("Read blog"), blog_path %></li>