fixed i18n strings

14 files changed, 46 insertions, 46 deletions

diff --git a/app/views/public_body/view_email.rhtml b/app/views/public_body/view_email.rhtml
index 3a92e9703..895b2c686 100644
--- a/app/views/public_body/view_email.rhtml
+++ b/app/views/public_body/view_email.rhtml
@@ -4,18 +4,18 @@
 
 <p>
 <% if @public_body.is_requestable? %>
-    <% _('WhatDoTheyKnow sends new requests to')%> <strong><%=h @public_body.request_email%></strong><% _(' for this authority.')%>
+    <%= _('WhatDoTheyKnow sends new requests to')%> <strong><%=h @public_body.request_email%></strong><% _(' for this authority.')%>
 <% else %>
     <% if @public_body.not_requestable_reason == 'not_apply' %>
-        <p><% _('Freedom of Information law no longer applies to this authority.
+        <p><%= _('Freedom of Information law no longer applies to this authority.
         Follow up messages to existing requests are sent to ')%><strong><%=h @public_body.request_email%></strong>.
         </p>
     <% elsif @public_body.not_requestable_reason == 'defunct' %>
         <p><%=h @public_body.name %> no longer exists.
-        <% _('Follow up messages to existing requests are sent to ')%><strong><%=h @public_body.request_email%></strong>.
+        <%= _('Follow up messages to existing requests are sent to ')%><strong><%=h @public_body.request_email%></strong>.
         </p>
     <% elsif @public_body.not_requestable_reason == 'bad_contact' %>
-        <p><% _('We do not have a working request email address for this authority.')%>
+        <p><%= _('We do not have a working request email address for this authority.')%>
         </p>
     <% else %>
         <% raise "unknown reason " + @reason %>
@@ -26,9 +26,9 @@
 
 <p>
     <% if @public_body.is_requestable? || @public_body.not_requestable_reason != 'bad_contact' %>
-        <% _('If the address is wrong, or you know a better address, please <a href="%s">contact us</a>.')% [help_contact_path]%>
+        <%= _('If the address is wrong, or you know a better address, please <a href="%s">contact us</a>.')% [help_contact_path]%>
     <% else %>
-       <% _(' If you know the address to use, then please <a href="%s">send it to us</a>.
+       <%= _(' If you know the address to use, then please <a href="%s">send it to us</a>.
         You may be able to find the address on their website, or by phoning them up and asking.')% [help_contact_path] %>
     <% end %>
 </p>
diff --git a/app/views/public_body/view_email_captcha.rhtml b/app/views/public_body/view_email_captcha.rhtml
index 492933078..cfee129a9 100644
--- a/app/views/public_body/view_email_captcha.rhtml
+++ b/app/views/public_body/view_email_captcha.rhtml
@@ -1,9 +1,9 @@
 <% @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_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>
+<p><%= _('To view the email address that we use to send FOI requests to ')%><%=h @public_body.name%>,
+<%= _('please enter these words.')%><p>
 
 <% form_for :contact do |f| %>
     <%= recaptcha_tags %>
diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml
index 1b05b77f7..1449caae7 100644
--- a/app/views/request/_request_listing_via_event.rhtml
+++ b/app/views/request/_request_listing_via_event.rhtml
@@ -25,24 +25,24 @@ 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_link_absolute(info_request.public_body) %>
+            <%= _('by') %> <%= user_link_absolute(info_request.user) %>
+            <%= _('on') %> <%= 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_link_absolute(info_request.public_body) %>
+            <%= _('by') %> <%= user_link_absolute(info_request.user) %>
+            <%= _('on') %> <%= 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_link_absolute(info_request.public_body) %>
+            <%= _('to') %> <%= user_link_absolute(info_request.user) %>
+            <%= _('on') %> <%= 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_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) %>.
         <% else %>
             <% raise _("unknown event type indexed ") + event.event_type %>
         <% end %>
diff --git a/app/views/request/list.rhtml b/app/views/request/list.rhtml
index a9f5481be..9e12b4175 100644
--- a/app/views/request/list.rhtml
+++ b/app/views/request/list.rhtml
@@ -26,7 +26,7 @@
             <% if result.class.to_s == 'InfoRequestEvent' %>
                 <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result, :info_request => result.info_request } %>
             <% else %>
-                <p><strong><%= ('Unexpected search result type') %> <%=result.class.to_s%></strong></p>
+                <p><strong><%= _('Unexpected search result type') %> <%=result.class.to_s%></strong></p>
             <% end %>
         <% end %>
     <% end %>
diff --git a/app/views/request/similar.rhtml b/app/views/request/similar.rhtml
index cec650bfe..d9806aeb1 100644
--- a/app/views/request/similar.rhtml
+++ b/app/views/request/similar.rhtml
@@ -15,7 +15,7 @@
         <% if result[:model].class.to_s == 'InfoRequestEvent' %>
             <%= render :partial => 'request/request_listing_via_event', :locals => { :event => result[:model], :info_request => result[:model].info_request } %>
         <% else %>
-            <p><strong><% _('Unexpected search result type ')%><%=result[:model].class.to_s%></strong></p>
+            <p><strong><%= _('Unexpected search result type ')%><%=result[:model].class.to_s%></strong></p>
         <% end %>
     <% end %>
 <% end %>
diff --git a/app/views/request/upload_response.rhtml b/app/views/request/upload_response.rhtml
index d18e03e97..eaa6602a1 100644
--- a/app/views/request/upload_response.rhtml
+++ b/app/views/request/upload_response.rhtml
@@ -37,7 +37,7 @@ file too large for email, use the form below.')%>
     <p>
         <%= hidden_field_tag 'submitted_upload_response', 1 %>
         <%= submit_tag "Upload FOI response" %>
-       <% _(' (<strong>patience</strong>, especially for large files, it may take a while!)')%>
+       <%= _(' (<strong>patience</strong>, especially for large files, it may take a while!)')%>
     </p>
 
 <% end %>
diff --git a/app/views/request_game/play.rhtml b/app/views/request_game/play.rhtml
index ac0f0bb56..acf6cce87 100644
--- a/app/views/request_game/play.rhtml
+++ b/app/views/request_game/play.rhtml
@@ -27,8 +27,8 @@
     <% end %>
     </table>
 </div>
-<h2><% =_("Play the request categorisation game!")%></h2>
-<p><% =_("Some people who've made requests haven't let us know whether they were
+<h2><%= _("Play the request categorisation game!")%></h2>
+<p><%= _("Some people who've made requests haven't let us know whether they were
 successful or not.  We need <strong>your</strong> help &ndash;
 choose one of these requests, read it, and let everyone know whether or not the
 information has been provided. Everyone'll be exceedingly grateful.")%></p>
diff --git a/app/views/request_mailer/old_unclassified_updated.rhtml b/app/views/request_mailer/old_unclassified_updated.rhtml
index 19963e192..9112e72a4 100644
--- a/app/views/request_mailer/old_unclassified_updated.rhtml
+++ b/app/views/request_mailer/old_unclassified_updated.rhtml
@@ -1,11 +1,11 @@
-<% _('To help us keep the site tidy, someone else has updated the status of the 
+<%= _('To help us keep the site tidy, someone else has updated the status of the 
 {{law_used_full}} request {{title}} 
 that you made to {{public_body}}, to 
 {{display_status}} If you disagree with 
 their categorisation, please update the status again yourself to what
 you believe to be more accurate.',:law_used_full=>@info_request.law_used_full,:title=>@info_request.title, :public_body=>@info_request.public_body.name,:display_status=>@info_request.display_status.downcase)%>
 
-<%= _('Follow this link to see the request:')%>
+<%=_ ('Follow this link to see the request:')%>
 
 <%= @url %>
 
diff --git a/app/views/request_mailer/overdue_alert.rhtml b/app/views/request_mailer/overdue_alert.rhtml
index b7bd728e7..a8bc76068 100644
--- a/app/views/request_mailer/overdue_alert.rhtml
+++ b/app/views/request_mailer/overdue_alert.rhtml
@@ -1,6 +1,6 @@
-<%= @info_request.public_body.name %> <% _('have delayed.')%>
+<%= @info_request.public_body.name %> <%= _('have delayed.')%>
 
-<%= _('They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law':law_used_short=>@info_request.law_used_short,:title=>@info_request.title)%><% if @info_request.public_body.is_school? %> <%=_('during term time')%> <% end %>.
+<%=_ ('They have not replied to your {{law_used_short}} request {{title}} promptly, as normally required by law':law_used_short=>@info_request.law_used_short,:title=>@info_request.title)%><% if @info_request.public_body.is_school? %> <%=_ ('during term time')%> <% end %>.
 
 <%= _('Click on the link below to send a message to {{public_body}} reminding them to reply to your request.':public_body=>@info_request.public_body.name)%>
 
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index 879d107bd..c6661696e 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -4,16 +4,16 @@
     <%= foi_error_messages_for :user_signin %>
 
     <% if not sign_in_as_existing_user %>
-    <h2><%= ('If you\'ve used WhatDoTheyKnow before')%></h2>
+    <h2><%= _('If you\'ve used WhatDoTheyKnow before')%></h2>
     <% end %>
 
     <p>
-    <label class="form_label" for="user_signin_email"><%= ('Your e-mail:')%></label>
+    <label class="form_label" for="user_signin_email"><%= _('Your e-mail:')%></label>
     <%= text_field 'user_signin', 'email', { :size => 20 } %>
     </p>
 
     <p>
-    <label class="form_label" for="user_signin_password"><%= ('Password:')%></label>
+    <label class="form_label" for="user_signin_password"><%= _('Password:')%></label>
     <%= password_field 'user_signin', 'password', { :size => 15 } %>
     </p>
 
@@ -23,7 +23,7 @@
 
     <p class="form_checkbox">
     <%= check_box_tag 'remember_me', "1" %>
-    <label for="remember_me"><%= ('Remember me</label> (keeps you signed in longer;
+    <label for="remember_me"><%= _('Remember me</label> (keeps you signed in longer;
     do not use on a public computer) ')%></p>
 
     <div class="form_button">
diff --git a/app/views/user/no_cookies.rhtml b/app/views/user/no_cookies.rhtml
index cf362617a..b5c36b57e 100644
--- a/app/views/user/no_cookies.rhtml
+++ b/app/views/user/no_cookies.rhtml
@@ -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.')%> 
 
-<% _('Please <a href="%s">get in touch</a> with us so we can fix it.') % [help_contact_path] %>
+<%= _('Please <a href="%s">get in touch</a> with us so we can fix it.') % [help_contact_path] %>
 
  <%= _('Let us know what you were doing when this message
 appeared and your browser and operating system type and version.')%></p>
 
-<p><% _('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="%s">contact us</a>.') % [help_contact_path] %>
 </p>
 
diff --git a/app/views/user/signchangepassword.rhtml b/app/views/user/signchangepassword.rhtml
index 90ca6e62a..822b446af 100644
--- a/app/views/user/signchangepassword.rhtml
+++ b/app/views/user/signchangepassword.rhtml
@@ -8,16 +8,16 @@
     <%= foi_error_messages_for :user %>
 
     <div class="form_note">
-    <h1><%= ('Change your password on WhatDoTheyKnow.com')%></h1>
+    <h1><%= _('Change your password on WhatDoTheyKnow.com')%></h1>
     </div>
 
     <p>
-    <label class="form_label" for="user_password"><%= ('New password:')%></label>
+    <label class="form_label" for="user_password"><%= _('New password:')%></label>
     <%= password_field 'user', 'password', { :size => 15 } %>
     </p>
 
     <p>
-    <label class="form_label" for="user_password_confirmation"><%= ('New password: (again)')%></label>
+    <label class="form_label" for="user_password_confirmation"><%= _('New password: (again)')%></label>
     <%= password_field 'user', 'password_confirmation', { :size => 15 } %>
     </p>
 
diff --git a/app/views/user/signchangepassword_confirm.rhtml b/app/views/user/signchangepassword_confirm.rhtml
index 145b56672..63b6515cd 100644
--- a/app/views/user/signchangepassword_confirm.rhtml
+++ b/app/views/user/signchangepassword_confirm.rhtml
@@ -1,13 +1,13 @@
 <% @title = h( _('Now check your email!')) %>
 
-<h1 class="confirmation_heading"><%= ('Now check your email!')%></h1>
+<h1 class="confirmation_heading"><%= _('Now check your email!')%></h1>
 
 <p class="confirmation_message">
-<%= ('We\'ve sent you an email, click the link in it, then you can change your password.')%>
+<%= _('We\'ve sent you an email, click the link in it, then you can change your password.')%>
 </p>
 
 <p class="confirmation_message">
-<small><%= ('If you use web-based email or have "junk mail" filters, also check your
+<small><%= _('If you use web-based email or have "junk mail" filters, also check your
 bulk/spam mail folders. Sometimes, our messages are marked that way.')%></small>
 </p>
 
diff --git a/app/views/user/signchangepassword_send_confirm.rhtml b/app/views/user/signchangepassword_send_confirm.rhtml
index f6341b7e8..21e62c881 100644
--- a/app/views/user/signchangepassword_send_confirm.rhtml
+++ b/app/views/user/signchangepassword_send_confirm.rhtml
@@ -6,16 +6,16 @@
     <%= foi_error_messages_for :signchangepassword %>
 
     <div class="form_note">
-    <h1><%= ('Change your password on WhatDoTheyKnow.com') %></h1>
+    <h1><%= _('Change your password on WhatDoTheyKnow.com') %></h1>
     </div>
 
     <p>
-    <label class="form_label" for="signchangepassword_email"><%= ('Your e-mail:')%></label>
+    <label class="form_label" for="signchangepassword_email"><%= _('Your e-mail:')%></label>
     <%= text_field 'signchangepassword', 'email', { :size => 20 } %>
     </p>
 
     <p class="form_note">
-   <%= (' <strong>Note:</strong>
+   <%= _(' <strong>Note:</strong>
     We will send you an email. Follow the instructions in it to change
     your password.')%>
     </p>