4 files changed, 13 insertions, 13 deletions
diff --git a/app/views/user/_signup.html.erb b/app/views/user/_signup.html.erb
index ac4fd3e10..ec6541881 100644
--- a/app/views/user/_signup.html.erb
+++ b/app/views/user/_signup.html.erb
@@ -10,8 +10,8 @@
         <%= text_field 'user_signup', 'email', { :size => 20, :tabindex => 60 } %>
     </p>
     <div class="form_item_note">
-        <%= raw(_('We will not reveal your email address to anybody unless you or
-        the law tell us to (<a href="%s">details</a>). ') %[help_privacy_path]) %>
+        <%= _('We will not reveal your email address to anybody unless you or
+        the law tell us to (<a href="{{url}}">details</a>). ', :url => help_privacy_path) %>
     </div>
 
     <p>
@@ -19,11 +19,11 @@
         <%= text_field 'user_signup', 'name', { :size => 20, :tabindex => 70, :autocomplete => "off" } %>
     </p>
     <div class="form_item_note">
-         <%= raw(_('Your <strong>name will appear publicly</strong> 
-        (<a href="%s">why?</a>)
+         <%= _('Your <strong>name will appear publicly</strong>
+        (<a href="{{why_url}}">why?</a>)
         on this website and in search engines. If you
-        are thinking of using a pseudonym, please 
-        <a href="%s">read this first</a>.') % [help_privacy_path+"#public_request", help_privacy_path+"#real_name"]) %>
+        are thinking of using a pseudonym, please
+        <a href="{{help_url}}">read this first</a>.', :why_url => (help_privacy_path+"#public_request").html_safe, :help_url => (help_privacy_path+"#real_name").html_safe) %>
     </div>
 
     <p>
diff --git a/app/views/user/no_cookies.html.erb b/app/views/user/no_cookies.html.erb
index c291367f2..0a4a39b1b 100644
--- a/app/views/user/no_cookies.html.erb
+++ b/app/views/user/no_cookies.html.erb
@@ -12,11 +12,11 @@ browser.  Then press refresh to have another go.')%></p>
 <p><%= _('If your browser is set to accept cookies and you are seeing this message,
 then there is probably a fault with our server.')%> 
 
-<%= raw(_('Please <a href="%s">get in touch</a> with us so we can fix it.') % [help_contact_path]) %>
+<%= _('Please <a href="{{url}}">get in touch</a> with us so we can fix it.', :url => help_contact_path.html_safe) %>
 
  <%= _('Let us know what you were doing when this message
 appeared and your browser and operating system type and version.')%></p>
 
-<p><%= raw(_('If you are still having trouble, please <a href="%s">contact us</a>.') % [help_contact_path]) %>
+<p><%= _('If you are still having trouble, please <a href="{{url}}">contact us</a>.', :url => help_contact_path.html_safe) %>
 </p>
 
diff --git a/app/views/user/show.html.erb b/app/views/user/show.html.erb
index b92ffcff2..c9862effe 100644
--- a/app/views/user/show.html.erb
+++ b/app/views/user/show.html.erb
@@ -97,7 +97,7 @@
 
     <% if not @is_you %>
         <p id="user_not_logged_in">
-           <%= raw(_('<a href="%s">Sign in</a> to change password, subscriptions and more ({{user_name}} only)',:user_name=>h(@display_user.name)) % [signin_url(:r => request.fullpath)]) %>
+           <%= _('<a href="{{url}}">Sign in</a> to change password, subscriptions and more ({{user_name}} only)',:user_name=>h(@display_user.name), :url => signin_url(:r => request.fullpath).html_safe) %>
         </p>
     <% end %>
   </div>
@@ -128,7 +128,7 @@
             <% end %>
         <% else %>
             <h2 class="foi_results" id="foi_requests">
-                <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @xapian_requests.matches_estimated) % @xapian_requests.matches_estimated.to_s : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests',  @xapian_requests.matches_estimated) % @xapian_requests.matches_estimated %>
+                <%= @is_you ? n_('Your {{count}} Freedom of Information request', 'Your {{count}} Freedom of Information requests', @xapian_requests.matches_estimated, :count => @xapian_requests.matches_estimated) : n_("This person's {{count}} Freedom of Information request", "This person's {{count}} Freedom of Information requests",  @xapian_requests.matches_estimated, :count => @xapian_requests.matches_estimated) %>
                 <!-- matches_estimated <%=@xapian_requests.matches_estimated%> -->
                 <%= @match_phrase %>
                 <%= @page_desc %>
@@ -158,7 +158,7 @@
             <% end %>
         <% else %>
             <h2 id="annotations">
-                <%= @is_you ? n_('Your %d annotation', 'Your %d annotations', @display_user.visible_comments.size) % @display_user.visible_comments.size : n_('This person\'s %d annotation', 'This person\'s %d annotations', @display_user.visible_comments.size) % @display_user.visible_comments.size %>
+                <%= @is_you ? n_('Your {{count}} annotation', 'Your {{count}} annotations', @display_user.visible_comments.size, :count => @display_user.visible_comments.size) : n_("This person's {{count}} annotation", "This person's {{count}} annotations", @display_user.visible_comments.size, :count => @display_user.visible_comments.size) %>
                   <!-- matches_estimated <%=@xapian_comments.matches_estimated%> -->
                 <%= @page_desc %>
             </h2>
diff --git a/app/views/user/wrong_user_unknown_email.html.erb b/app/views/user/wrong_user_unknown_email.html.erb
index c59c56941..c1967fc1f 100644
--- a/app/views/user/wrong_user_unknown_email.html.erb
+++ b/app/views/user/wrong_user_unknown_email.html.erb
@@ -1,8 +1,8 @@
 
 <p id="sign_in_reason">
-<%= @reason_params[:web] %>. <%= raw(_('Unfortunately we don\'t know the FOI
+<%= @reason_params[:web] %>. <%= _('Unfortunately we don\'t know the FOI
 email address for that authority, so we can\'t validate this.
-Please <a href="%s">contact us</a> to sort it out.') % [help_contact_path]) %>
+Please <a href="{{url}}">contact us</a> to sort it out.', :url => help_contact_path.html_safe) %>
 </p>