I18n'ize some more strings in views

3 files changed, 15 insertions, 15 deletions

diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb
index ced63f76f..16a0dab87 100644
--- a/app/models/track_thing.rb
+++ b/app/models/track_thing.rb
@@ -120,8 +120,8 @@ class TrackThing < ActiveRecord::Base
                 @params = {
                     # Website
                     :list_description => "'<a href=\"/request/" + CGI.escapeHTML(self.info_request.url_title) + "\">" + CGI.escapeHTML(self.info_request.title) + "</a>', a request", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how 
-                    :verb_on_page => "Track this request by email",
-                    :verb_on_page_already => "You are already tracking this request by email",
+                    :verb_on_page => _("Track this request by email"),
+                    :verb_on_page_already => _("You are already tracking this request by email"),
                     # Email
                     :title_in_email => "New updates for the request '" + self.info_request.title + "'",
                     :title_in_rss => "New updates for the request '" + self.info_request.title + "'",
@@ -135,23 +135,23 @@ class TrackThing < ActiveRecord::Base
             elsif self.track_type == 'all_new_requests'
                 @params = {
                     # Website
-                    :list_description => "any <a href=\"/list\">new requests</a>",
-                    :verb_on_page => "Email me when there are new requests",
-                    :verb_on_page_already => "You are being emailed when there are new requests",
+                    :list_description => _("any <a href=\"/list\">new requests</a>"),
+                    :verb_on_page => _("Email me when there are new requests"),
+                    :verb_on_page_already => _("You are being emailed when there are new requests"),
                     # Email
-                    :title_in_email => "New Freedom of Information requests",
-                    :title_in_rss => "New Freedom of Information requests",
+                    :title_in_email => _("New Freedom of Information requests"),
+                    :title_in_rss => _("New Freedom of Information requests"),
                     # Authentication
-                    :web => "To be emailed about any new requests",
-                    :email => "Then you will be emailed whenever anyone makes a new FOI request.",
-                    :email_subject => "Confirm you want to be emailed about new requests",
+                    :web => _("To be emailed about any new requests"),
+                    :email => _("Then you will be emailed whenever anyone makes a new FOI request."),
+                    :email_subject => _("Confirm you want to be emailed about new requests"),
                     # RSS sorting
                     :feed_sortby => 'newest'
                 }
             elsif self.track_type == 'all_successful_requests'
                 @params = {
                     # Website
-                    :list_description => "any <a href=\"/list/successful\">successful requests</a>",
+                    :list_description => _("any <a href=\"/list/successful\">successful requests</a>"),
                     :verb_on_page => _("Email me new successful responses "),
                     :verb_on_page_already => _("You are being emailed about any new successful responses"),
                     # Email
diff --git a/app/views/public_body/_body_listing_single.rhtml b/app/views/public_body/_body_listing_single.rhtml
index 97cfd2e71..7637a1077 100644
--- a/app/views/public_body/_body_listing_single.rhtml
+++ b/app/views/public_body/_body_listing_single.rhtml
@@ -9,7 +9,7 @@
     <span class="desc">
     <% if !public_body.short_name.empty? || !public_body.notes_without_html.empty? %>
         <% if !public_body.short_name.empty? %>
-            Also called <%=highlight_words(public_body.short_name, @highlight_words) %>.
+            <%= _("Also called {{other_name}}.", :other_name => highlight_words(public_body.short_name, @highlight_words)) %>
         <% end %>
         <% if !public_body.notes_without_html.empty? %>
             <%= highlight_and_excerpt(public_body.notes_without_html, @highlight_words, 150) %>
@@ -18,12 +18,12 @@
     <% end %>
 	</span>
     <span class="bottomline">
-        <%= pluralize(public_body.info_requests.size, "request") %> made. 
+        <%= n_('%d request made.', '%d requests made.', public_body.info_requests.size) % public_body.info_requests.size %>
         <% if !@include_request_link_in_authority_listing.nil? %>
         <%= link_to _("Make your own request"), public_body_url(public_body) %>.
         <% end %>
         <br>
-        Added on <%= simple_date(public_body.created_at) %>.
+        <%= _("Added on {{date}}", :date => simple_date(public_body.created_at)) %>.
     </span>
 </div>
 
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index 3d325e2b8..36bba8851 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -77,7 +77,7 @@
         <% if @public_body.eir_only? %>
             <%= pluralize(@public_body.info_requests.size, "Environmental Information Regulations request made using this site") %>
         <% else %>
-		<%= n_('%d Freedom of Information request', '%d Freedom of Information requests', @public_body.info_requests.size) % @public_body.info_requests.size %> made using this site
+		<%= n_('%d Freedom of Information request made using this site', '%d Freedom of Information requests made using this site', @public_body.info_requests.size) % @public_body.info_requests.size %>
         <% end %>
         <%= @page_desc %>
         </h2>