aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Landauer <matthew@openaustralia.org>2013-01-03 12:30:07 +1100
committerMatthew Landauer <matthew@openaustralia.org>2013-01-03 12:30:07 +1100
commit0acab1169c4024747f622501075ca3ddeabd4195 (patch)
treef76d38bc8333e8589247e1f41e4c490549eb885d
parent8461a4d704ab5d6321d626c592fc39a708605caf (diff)
Escaping fixes
-rw-r--r--app/models/public_body.rb2
-rw-r--r--app/views/public_body/show.rhtml2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 57fe27767..6f6b37ba8 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -301,7 +301,7 @@ class PublicBody < ActiveRecord::Base
ret = ret + " and "
end
ret = ret + types[-1]
- return ret
+ return ret.html_safe
else
return _("A public authority")
end
diff --git a/app/views/public_body/show.rhtml b/app/views/public_body/show.rhtml
index e13f9d1c0..6431b4742 100644
--- a/app/views/public_body/show.rhtml
+++ b/app/views/public_body/show.rhtml
@@ -4,7 +4,7 @@
<h2><%= _('Follow this authority')%></h2>
<% follower_count = TrackThing.count(:all, :conditions => ["public_body_id = ?", @public_body.id]) %>
- <p><%= n_("<span id='follow_count'>%d</span> person is following this authority", "<span id='follow_count'>%d</span> people are following this authority", follower_count) % follower_count %></p>
+ <p><%= raw(n_("<span id='follow_count'>%d</span> person is following this authority", "<span id='follow_count'>%d</span> people are following this authority", follower_count) % follower_count) %></p>
<%= render :partial => 'track/tracking_links', :locals => { :track_thing => @track_thing, :own_request => false, :location => 'sidebar' } %>
<h2><%= _('More about this authority')%></h2>