Fixed i18n strings

8 files changed, 16 insertions, 27 deletions

diff --git a/app/views/public_body/view_email_captcha.rhtml b/app/views/public_body/view_email_captcha.rhtml
index cfee129a9..95b50ddd8 100644
--- a/app/views/public_body/view_email_captcha.rhtml
+++ b/app/views/public_body/view_email_captcha.rhtml
@@ -1,6 +1,6 @@
 <% @title = "View FOI email address for '" + h(@public_body.name) + "'" %>
 
-<h1><%= _('View FOI email address for')%> '<%=public_body_link(@public_body)%>'</h1>
+<h1><%= _('View FOI email address for {{public_body_name}}',:public_body_name=>public_body_link(@public_body))%></h1>
 
 <p><%= _('To view the email address that we use to send FOI requests to ')%><%=h @public_body.name%>,
 <%= _('please enter these words.')%><p>
diff --git a/app/views/request/_request_listing_single.rhtml b/app/views/request/_request_listing_single.rhtml
index bb83df9d3..a300010cd 100644
--- a/app/views/request/_request_listing_single.rhtml
+++ b/app/views/request/_request_listing_single.rhtml
@@ -9,9 +9,7 @@
         <strong>
         <%= info_request.display_status %>
         </strong><br>
-        <%= _('Requested from') %> <%= public_body_link(info_request.public_body) %>
-        <%= _('by') %> <%= user_link(info_request.user) %>
-        <%= _('on') %> <%= simple_date(info_request.created_at) %>.
+        <%= _('Requested from {{public_body_name}} by {{info_request_user}} on {{date}}',:public_body_name=>public_body_link(info_request.public_body),:info_request_user=>user_link(info_request.user),:date=>simple_date(info_request.created_at)) %>
     </span>
 </div>
 
diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml
index 1449caae7..afacabea5 100644
--- a/app/views/request/_request_listing_via_event.rhtml
+++ b/app/views/request/_request_listing_via_event.rhtml
@@ -25,24 +25,15 @@ end %>
         </strong><br>
 
         <% if event.event_type == 'sent' %>
-            <%= _('Request sent to') %> <%= public_body_link_absolute(info_request.public_body) %>
-            <%= _('by') %> <%= user_link_absolute(info_request.user) %>
-            <%= _('on') %> <%= simple_date(event.created_at) %>.
+            <%= _('Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>user_link_absolute(info_request.user),:date=>simple_date(event.created_at )) %> 
         <% elsif event.event_type == 'followup_sent' %>
             <%=event.display_status %>
-            <%= _('sent to') %> <%= public_body_link_absolute(info_request.public_body) %>
-            <%= _('by') %> <%= user_link_absolute(info_request.user) %>
-            <%= _('on') %> <%= simple_date(event.created_at) %>.
+            <%= _('sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>user_link_absolute(info_request.user),:date=>simple_date(event.created_at )) %> 
         <% elsif event.event_type == 'response' %>
             <%=event.display_status %>
-            <%= _('by') %> <%= public_body_link_absolute(info_request.public_body) %>
-            <%= _('to') %> <%= user_link_absolute(info_request.user) %>
-            <%= _('on') %> <%= simple_date(event.created_at) %>.
+            <%= _('by {{public_body_name}} to {{info_request_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>user_link_absolute(info_request.user),:date=>simple_date(event.created_at )) %> 
         <% elsif event.event_type == 'comment' %>
-            <%= _('Request to') %> <%= public_body_link_absolute(info_request.public_body) %>
-            <%= _('by') %> <%= user_link_absolute(info_request.user) %>.
-            <%= _('Annotated by') %> <%= user_link_absolute(event.comment.user) %>
-            <%= _('on') %> <%= simple_date(event.created_at) %>.
+            <%= _('Request to {{public_body_name}} by {{info_request_user}}. Annotated by {{event_comment_user}} on {{date}}.',:public_body_name=>public_body_link_absolute(info_request.public_body),:info_request_user=>user_link_absolute(info_request.user),:event_comment_user=>user_link_absolute(event.comment.user),:date=>simple_date(event.created_at)) %>
         <% else %>
             <% raise _("unknown event type indexed ") + event.event_type %>
         <% end %>
diff --git a/app/views/request/_sidebar_request_listing.rhtml b/app/views/request/_sidebar_request_listing.rhtml
index 3b8a90a3c..ec5a5813d 100644
--- a/app/views/request/_sidebar_request_listing.rhtml
+++ b/app/views/request/_sidebar_request_listing.rhtml
@@ -10,7 +10,7 @@
             <strong>
             <%= info_request.display_status %>
             </strong><br>
-           <% _('Requested on ')%><%= simple_date(info_request.created_at) %>.
+           <% _('Requested on {{date}}',:date=>simple_date(info_request.created_at)) %>.
         </span>
     </div>
 <% end %>
diff --git a/app/views/request/followup_bad.rhtml b/app/views/request/followup_bad.rhtml
index 3faabace0..670139211 100644
--- a/app/views/request/followup_bad.rhtml
+++ b/app/views/request/followup_bad.rhtml
@@ -1,7 +1,7 @@
 <% if @incoming_message.nil? || !@incoming_message.valid_to_reply_to? %>
-    <% @title = _("Unable to send follow up message to ") + OutgoingMailer.name_for_followup(@info_request, nil) %>
+    <% @title = _("Unable to send follow up message to {{username}}",:username=>OutgoingMailer.name_for_followup(@info_request, nil)) %>
 <% else %>
-    <% @title = _("Unable to send a reply to ") + OutgoingMailer.name_for_followup(@info_request, @incoming_message) %>
+    <% @title = _("Unable to send a reply to {{username}}",:username=>OutgoingMailer.name_for_followup(@info_request, @incoming_message)) %>
 <% end %>
 
 <h1><%=@title%></h1>
diff --git a/app/views/user/signchangeemail.rhtml b/app/views/user/signchangeemail.rhtml
index 3c567b3dd..c0c559380 100644
--- a/app/views/user/signchangeemail.rhtml
+++ b/app/views/user/signchangeemail.rhtml
@@ -1,4 +1,4 @@
-<% @title = _('Change your email address used on WhatDoTheyKnow.com') %>
+<% @title = _('Change your email address used on {{site_name}}', :site_name => site_name) %>
 
 <% raise _('internal error') if not @user %>
 
@@ -8,7 +8,7 @@
     <%= foi_error_messages_for :signchangeemail %>
 
     <div class="form_note">
-    <h1> <%= _('Change your email address used on WhatDoTheyKnow.com')%></h1>
+    <h1> <% _('Change your email address used on {{site_name}}', :site_name => site_name) %></h1>
     </div>
 
     <p>
diff --git a/app/views/user/signchangepassword.rhtml b/app/views/user/signchangepassword.rhtml
index 822b446af..b31757ba5 100644
--- a/app/views/user/signchangepassword.rhtml
+++ b/app/views/user/signchangepassword.rhtml
@@ -1,4 +1,4 @@
-<% @title = "Change your password on WhatDoTheyKnow.com" %>
+<% @title = _("Change your password on {{site_name}}', :site_name => site_name) %>
 
 <% raise "internal error" if not @user %>
 
@@ -8,7 +8,7 @@
     <%= foi_error_messages_for :user %>
 
     <div class="form_note">
-    <h1><%= _('Change your password on WhatDoTheyKnow.com')%></h1>
+    <h1><%= _('Change your password on {{site_name}}', :site_name => site_name)%></h1>
     </div>
 
     <p>
@@ -24,7 +24,7 @@
     <div class="form_button">
     <%= hidden_field_tag 'submitted_signchangepassword_do', 1 %>
     <%= hidden_field_tag 'pretoken', params[:pretoken] %>
-    <%= submit_tag _('Change password on WhatDoTheyKnow.com') %>
+    <%= submit_tag _('Change password on {{site_name}}', :site_name => site_name) %>
     </div>
 <% end %>
 
diff --git a/app/views/user/signchangepassword_send_confirm.rhtml b/app/views/user/signchangepassword_send_confirm.rhtml
index 21e62c881..84ee28f07 100644
--- a/app/views/user/signchangepassword_send_confirm.rhtml
+++ b/app/views/user/signchangepassword_send_confirm.rhtml
@@ -1,4 +1,4 @@
-<% @title = _('Change your password on WhatDoTheyKnow.com') %>
+<% @title = _('Change your password on {{site_name}}', :site_name => site_name) %>
 
 <div id="change_password">
 
@@ -6,7 +6,7 @@
     <%= foi_error_messages_for :signchangepassword %>
 
     <div class="form_note">
-    <h1><%= _('Change your password on WhatDoTheyKnow.com') %></h1>
+    <h1><%= _('Change your password on {{site_name}}', :site_name => site_name) %></h1>
     </div>
 
     <p>