7 files changed, 21 insertions, 25 deletions
diff --git a/app/views/user/_signin.rhtml b/app/views/user/_signin.rhtml
index c6661696e..79628b3a9 100644
--- a/app/views/user/_signin.rhtml
+++ b/app/views/user/_signin.rhtml
@@ -4,7 +4,7 @@
     <%= 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 {{site_name}} before', :site_name=>site_name)%></h2>
     <% end %>
 
     <p>
diff --git a/app/views/user/_signup.rhtml b/app/views/user/_signup.rhtml
index 70120bc5f..6b0a1f8c7 100644
--- a/app/views/user/_signup.rhtml
+++ b/app/views/user/_signup.rhtml
@@ -3,7 +3,7 @@
 <% form_tag({:action => "signup"}, {:id => "signup_form"}) do %>
     <%= foi_error_messages_for :user_signup %>
 
-    <h2><%= _('If you\'re new to WhatDoTheyKnow')%></h2>
+    <h2><%= _('If you\'re new to {{site_name}}', :site_name=>site_name)%></h2>
 
     <p>
         <label class="form_label" for="user_signup_email"><%= _('Your e-mail:')%></label>
diff --git a/app/views/user/set_crop_profile_photo.rhtml b/app/views/user/set_crop_profile_photo.rhtml
index 33b78e193..db18d10a1 100644
--- a/app/views/user/set_crop_profile_photo.rhtml
+++ b/app/views/user/set_crop_profile_photo.rhtml
@@ -33,7 +33,7 @@
     <%= hidden_field_tag 'draft_profile_photo_id', @draft_profile_photo.id %>
 
     <p><%= _('<strong>Privacy note:</strong> Your photo will be shown in public on the Internet, 
-    wherever you do something on WhatDoTheyKnow.')%>
+    wherever you do something on {{site_name}}.', :site_name=>site_name)%>
 
     <p>
         <%= hidden_field_tag 'submitted_crop_profile_photo', 1 %>
diff --git a/app/views/user/set_draft_profile_photo.rhtml b/app/views/user/set_draft_profile_photo.rhtml
index b6a39df5e..70d27074b 100644
--- a/app/views/user/set_draft_profile_photo.rhtml
+++ b/app/views/user/set_draft_profile_photo.rhtml
@@ -16,7 +16,7 @@
 
 <ul>
     <li><%= _('Your photo will be shown in public <strong>on the Internet</strong>, 
-    wherever you do something on WhatDoTheyKnow.')%>
+    wherever you do something on {{site_name}}.', :site_name=>site_name)%>
     </li>
 
     <li><%= _('Please don\'t upload offensive pictures. We will take down images
diff --git a/app/views/user/set_profile_about_me.rhtml b/app/views/user/set_profile_about_me.rhtml
index aa53d6720..6c1edc254 100644
--- a/app/views/user/set_profile_about_me.rhtml
+++ b/app/views/user/set_profile_about_me.rhtml
@@ -1,4 +1,4 @@
-<% @title = _('Change the text about you on your profile at WhatDoTheyKnow.com') %>
+<% @title = _('Change the text about you on your profile at {{site_name}}', :site_name=>site_name) %>
 
 <% raise _('internal error') if not @user %>
 
@@ -11,8 +11,8 @@
            <%= _(' What are you investigating using Freedom of Information? ')%> 
         </p>
         <p>
-          <%= _('  This will appear on your WhatDoTheyKnow profile, to make it
-            easier for others to get involved with what you\'re doing.')%>
+          <%= _('  This will appear on your {{site_name}} profile, to make it
+            easier for others to get involved with what you\'re doing.', :site_name=>site_name)%>
         </p>
     </div>
 
@@ -26,7 +26,7 @@
            <%= _(' Include relevant links, such as to a campaign page, your blog or a
             twitter account. They will be made clickable. 
             e.g.')%>
-            <a href="http://www.twitter.com/whatdotheyknow">http://www.twitter.com/whatdotheyknow</a>
+            <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %></a>
         </p>
     </div>
 
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml
index 09bf3de5f..8fd6c52ad 100644
--- a/app/views/user/show.rhtml
+++ b/app/views/user/show.rhtml
@@ -59,7 +59,7 @@
     <h1> <%= h(@display_user.name) + (@is_you ? _(" (you)") : "") %></h1>
 
     <p class="subtitle">
-       <%= _('Joined WhatDoTheyKnow in') %> <%= year_from_date(@display_user.created_at) %>
+       <%= _('Joined {{site_name}} in', :site_name=>site_name) %> <%= year_from_date(@display_user.created_at) %>
         <% if !@user.nil? && @user.admin_page_links? %>
         (<%= link_to "admin", user_admin_url(@display_user) %>)
         <% end %>
@@ -76,7 +76,7 @@
         <div id="user_public_banned">
             <p>
                 <strong>
-					<%= _('This user has been banned from WhatDoTheyKnow.com ')%>
+					<%= _('This user has been banned from {{site_name}} ', :site_name=>site_name)%>
                 </strong>
             </p>
             <p>
@@ -110,22 +110,19 @@
 
     <% if not @is_you %>
         <p id="user_not_logged_in">
-            <%= link_to _('Sign in'), signin_url(:r => request.request_uri) %><%= _('to change password, 
-            subscriptions and more')%> (<%=h @display_user.name %> <%= _('only')%>)
+           <%= _('<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.request_uri)]%>
         </p>
     <% end %>
 
     <% if !@xapian_requests.nil? %>
         <% if @xapian_requests.results.empty? %>
             <% if @page == 1 %>
-                <h2 id="foi_requests"><%= _('Freedom of Information requests made by')%> <%= @is_you ? 'you' : 'this person' %> </h2>
-                <p><%= @is_you ? _('You have') : _('This person has') %>
-               <%= _(' made no Freedom of Information requests using this site.')%></p>
+                <h2 id="foi_requests"><%= @is_you ? 'Freedom of Information requests made by you' : 'Freedom of Information requests made by this person' %> </h2>
+                <p><%= @is_you ? _('You have made no Freedom of Information requests using this site.') : _('This person has made no Freedom of Information requests using this site.') %>
             <% end %>
         <% else %>
             <h2 id="foi_requests">
-                <%= @is_you ? 'Your ' : "This person's " %>
-                <%=pluralize(@display_user.info_requests.size, _('Freedom of Information request')) %>
+                <%= @is_you ? n_('Your %d Freedom of Information request', 'Your %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size  : n_('This person\'s %d Freedom of Information request', 'This person\'s %d Freedom of Information requests', @display_user.info_requests.size) % @display_user.info_requests.size %>
                 <!-- matches_estimated <%=@xapian_requests.matches_estimated%> -->
                 <%= @page_desc %>
             </h2>
@@ -137,21 +134,20 @@
             <%= will_paginate WillPaginate::Collection.new(@page, @per_page, @display_user.info_requests.size) %>
         <% end %>
     <% else %> 
-        <h2 id="foi_requests"><%= _('Freedom of Information requests made by')%> <%= @is_you ? _('you') : _('this person') %> </h2>
+        <h2 id="foi_requests"><%= @is_you ? _('Freedom of Information requests made by you') : _('Freedom of Information requests made by this person') %> </h2>
         <p><%= _('The search index is currently offline, so we can\'t show the Freedom of Information requests this person has made.')%></p>
     <% end %> 
 
     <% if !@xapian_comments.nil? %>
         <% if @xapian_comments.results.empty? %>
             <% if @page == 1 %>
-                <h2><%= @is_you ? 'Your' : 'This person\'s' %> <%= _('annotations')%> </h2>
-                <p>None made.</p>
+                <h2><%= @is_you ? _('Your annotations') : _('This person\'s annotations') %></h2>
+          		<p><%= _('None made.')%></p>
             <% end %>
         <% else %>
             <h2 id="annotations">
-                <%= @is_you ? _('Your ') : _('This person\'s') %>
-                <%=pluralize(@display_user.visible_comments.size, _('annotation')) %>
-                <!-- matches_estimated <%=@xapian_comments.matches_estimated%> -->
+                <%= @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 %>
+                  <!-- matches_estimated <%=@xapian_comments.matches_estimated%> -->
                 <%= @page_desc %>
             </h2>
 
@@ -166,7 +162,7 @@
     <% if @is_you %>
         <% if @track_things.empty? %>
             <h2 id="email_subscriptions"> <%= _('Your email subscriptions')%></h2>
-            <p>None made.</p>
+            <p><%= _('None made.')%></p>
         <% else %>
             <h2 id="email_subscriptions"> Your <%=pluralize(@track_things.size, _('email subscription')) %> </h2>
             <% if @track_things_grouped.size == 1 %>
diff --git a/app/views/user/signchangeemail.rhtml b/app/views/user/signchangeemail.rhtml
index c0c559380..0f8b76bc5 100644
--- a/app/views/user/signchangeemail.rhtml
+++ b/app/views/user/signchangeemail.rhtml
@@ -34,7 +34,7 @@
 
     <div class="form_button">
     <%= hidden_field_tag 'submitted_signchangeemail_do', 1 %>
-    <%= submit_tag "Change email on WhatDoTheyKnow.com" %>
+    <%= submit_tag _("Change email on {{site_name}}", :site_name=>site_name) %>
     </div>
 <% end %>