Merge remote-tracking branch 'openaustralia_github/request_action_admin_fixes' into rails-3-develop

3 files changed, 10 insertions, 10 deletions

diff --git a/app/views/admin_request/hidden_user_explanation.html.erb b/app/views/admin_request/hidden_user_explanation.html.erb
index 7084e986f..d0a5d727d 100644
--- a/app/views/admin_request/hidden_user_explanation.html.erb
+++ b/app/views/admin_request/hidden_user_explanation.html.erb
@@ -1,10 +1,10 @@
-Dear <%= name_to %>,
+<%= _("Dear {{name}},", :name => name_to) %>
 
-Your request '<%= info_request.title.html_safe %>' at <%= info_request_url %> has been reviewed by moderators.
+<%= _("Your request '{{request}}' at {{url}} has been reviewed by moderators.", :request => info_request.title.html_safe, :url => info_request_url) %>
 
-We consider it <% if reason == 'not_foi' %>is not a valid FOI request<% else %>to be vexatious<% end%>, and have therefore hidden it from other users. You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further.
+<%= reason == 'not_foi' ? _("We consider it is not a valid FOI request, and have therefore hidden it from other users.") : _("We consider it to be vexatious, and have therefore hidden it from other users.") %> <%= _("You will still be able to view it while logged in to the site. Please reply to this email if you would like to discuss this decision further.") %>
 
-Yours,
+<%= _("Yours,") %>
 
-The <%= site_name %> team.
+<%= _("The {{site_name}} team.", :site_name => site_name) %>
 
diff --git a/app/views/admin_request/show.html.erb b/app/views/admin_request/show.html.erb
index 67f10c182..9cbcb68f0 100644
--- a/app/views/admin_request/show.html.erb
+++ b/app/views/admin_request/show.html.erb
@@ -121,7 +121,7 @@
       <p class="help-block">(see also option to general URLs for individual incoming messages below)</p>
     </div>
   </div>
-  <% form_tag admin_request_hide_path(@info_request), :class => "form form-inline", :id => "hide_request_form", 'data-info-request-id' => @info_request.id.to_s do %>
+  <%= form_tag admin_request_hide_path(@info_request), :class => "form form-inline", :id => "hide_request_form", 'data-info-request-id' => @info_request.id.to_s do %>
     <div class="control-group">
       <% if  @info_request.is_external? %>
         <label class="control-label">Hide the request:</label>
@@ -149,7 +149,7 @@
         <div class="control-group" id="request_hidden_user_subject">
           <label for="request_hidden_user_subject_field" class="control-label">Subject of email:</label>
           <div class="controls">
-            <%= text_field_tag "subject", "Your request on WhatDoTheyKnow.com hidden", {:id => "request_hidden_user_subject_field", :cols => 100} %>
+            <%= text_field_tag "subject", _("Your request on {{site_name}} hidden", :site_name => site_name), {:id => "request_hidden_user_subject_field", :cols => 100} %>
           </div>
         </div>
 
@@ -207,7 +207,7 @@
                 </td>
                 <td>
                   <% if column_name == 'params_yaml' %>
-                    <%= info_request_event.params_yaml_as_html %>
+                    <%= info_request_event.params_yaml_as_html.html_safe %>
                   <% elsif value.nil? %>
                     nil
                   <% elsif %w(text string).include?(type) %>
diff --git a/app/views/admin_user/show.html.erb b/app/views/admin_user/show.html.erb
index 26a385f31..c93c08e50 100644
--- a/app/views/admin_user/show.html.erb
+++ b/app/views/admin_user/show.html.erb
@@ -32,13 +32,13 @@
             <%=link_to @admin_user.email, "mailto:#{h @admin_user.email}"%>
           <% elsif column_name == 'email_bounce_message' %>
             <% unless @admin_user.email_bounce_message.empty? %>
-              <%= link_to _("See bounce message"), admin_user_show_bounce(@admin_user.id) %>
+              <%= link_to _("See bounce message"), admin_user_show_bounce_path(@admin_user.id) %>
             <% end %>
           <% else %>
             <%=h admin_value(value)%>
           <% end %>
           <% if column_name == 'email_bounced_at' && !@admin_user.email_bounced_at.nil? %>
-            <% form_tag admin_user_clear_bounce_path(@admin_user), :class => "form form-inline" do %>
+            <%= form_tag admin_user_clear_bounce_path(@admin_user), :class => "form form-inline" do %>
               <input type="submit" name="action" value="Clear bounce" class="btn btn-info">
             <% end %>
           <% end %>