diff options
| -rw-r--r-- | app/models/track_thing.rb | 6 | ||||
| -rw-r--r-- | app/views/body/show.rhtml | 16 | ||||
| -rw-r--r-- | app/views/track/_tracking_people_and_link.rhtml | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/app/models/track_thing.rb b/app/models/track_thing.rb index 301e34f18..7165719db 100644 --- a/app/models/track_thing.rb +++ b/app/models/track_thing.rb @@ -21,7 +21,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: track_thing.rb,v 1.26 2008-07-17 10:32:01 francis Exp $ +# $Id: track_thing.rb,v 1.27 2008-07-17 11:24:03 francis Exp $ class TrackThing < ActiveRecord::Base belongs_to :tracking_user, :class_name => 'User' @@ -156,8 +156,8 @@ class TrackThing < ActiveRecord::Base # Website :set_title => "How would you like to be told about new requests to the public authority '" + CGI.escapeHTML(self.public_body.name) + "'?", :list_description => "'<a href=\"/body/" + CGI.escapeHTML(self.public_body.url_name) + "\">" + CGI.escapeHTML(self.public_body.name) + "</a>', a public authority", # XXX yeuch, sometimes I just want to call view helpers from the model, sorry! can't work out how - :verb_on_page => "Be told about new requests to this public authority", - :verb_on_page_already => "being told about new requests to this public authority", + :verb_on_page => "Be told about new requests to " + CGI.escapeHTML(self.public_body.name), + :verb_on_page_already => "being told about new requests to " + CGI.escapeHTML(self.public_body.name), # Email :title_in_email => "New " + self.public_body.law_only_short + " requests to '" + self.public_body.name + "'", :title_in_rss => "New " + self.public_body.law_only_short + " requests to '" + self.public_body.name + "'", diff --git a/app/views/body/show.rhtml b/app/views/body/show.rhtml index c7dc49dbf..e90dee5f5 100644 --- a/app/views/body/show.rhtml +++ b/app/views/body/show.rhtml @@ -22,27 +22,27 @@ <p> <% if @public_body.eir_only? %> -<%= link_to "Make new EIR request to " + h(@public_body.short_or_long_name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%> +<%= link_to "Make a new EIR request to " + h(@public_body.name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%> <% else %> -<%= link_to "Make new FOI request to " + h(@public_body.short_or_long_name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%> +<%= link_to "Make a new FOI request to " + h(@public_body.name), new_request_to_body_url(:public_body_id => @public_body.id.to_s)%> <% end %> </p> <% if @public_body.info_requests.empty? %> <% if @public_body.eir_only? %> - <h2>Environmental Information Regulations requests made to this authority</h2> - <p>Nobody has made any Environmental Information Regulations requests to this public authority using this site.</p> + <h2>Environmental Information Regulations requests made</h2> + <p>Nobody has made any Environmental Information Regulations requests to <%=h(@public_body.name)%> using this site.</p> <% else %> - <h2>Freedom of Information requests made to this authority</h2> - <p>Nobody has made any Freedom of Information requests to this public authority using this site.</p> + <h2>Freedom of Information requests made</h2> + <p>Nobody has made any Freedom of Information requests to <%=h(@public_body.name)%> using this site.</p> <% end %> <% else %> <h2> <% if @public_body.eir_only? %> - <%=pluralize(@public_body.info_requests.size, "Environmental Information Regulations request") %> made to this authority + <%=pluralize(@public_body.info_requests.size, "Environmental Information Regulations request") %> made <% else %> - <%=pluralize(@public_body.info_requests.size, "Freedom of Information request") %> made to this authority + <%=pluralize(@public_body.info_requests.size, "Freedom of Information request") %> made <% end %> </h2> diff --git a/app/views/track/_tracking_people_and_link.rhtml b/app/views/track/_tracking_people_and_link.rhtml index 0d767463d..c33620f67 100644 --- a/app/views/track/_tracking_people_and_link.rhtml +++ b/app/views/track/_tracking_people_and_link.rhtml @@ -35,7 +35,7 @@ <p>You may also get an <%= link_to 'RSS feed', do_track_url(track_thing) %> <img src="/images/feed-14.png" alt="" class="rss"></p> <% else %> - <p>Be the first to <%= link_to track_thing.params[:verb_on_page].downcase, do_track_url(track_thing) %> + <p>Be the first to <%= link_to MySociety::Format.lcfirst(track_thing.params[:verb_on_page]), do_track_url(track_thing) %> (by email or RSS feed <img src="/images/feed-14.png" alt="" class="rss">)</p> <% end %> <% end %> |