diff options
Diffstat (limited to 'app/views/user/show.rhtml')
| -rw-r--r-- | app/views/user/show.rhtml | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index c3a99311a..8fd6c52ad 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -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 %> |