diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-06-16 13:46:22 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-06-16 13:46:22 +0100 |
| commit | 04145fbe231cdbbc88b9172dad1ae3d1ddfb65cc (patch) | |
| tree | 0516d6a792f4f0174e673579e2bf01bb4f8242bb /app/views/user | |
| parent | 6c89d63b6eebe33401efbf376e3884c61fb92d26 (diff) | |
| parent | 7bf6cbe307d3fd99680c084025240ed504e37297 (diff) | |
Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
Diffstat (limited to 'app/views/user')
| -rw-r--r-- | app/views/user/_user_listing_single.html.erb | 2 | ||||
| -rw-r--r-- | app/views/user/show.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/user/_user_listing_single.html.erb b/app/views/user/_user_listing_single.html.erb index ed1b95718..3cb0d283f 100644 --- a/app/views/user/_user_listing_single.html.erb +++ b/app/views/user/_user_listing_single.html.erb @@ -18,7 +18,7 @@ end %> <span class="bottomline"> <%= pluralize(display_user.info_requests.size, "request") %> <%= _('made.')%> <%= pluralize(display_user.visible_comments.size, "annotation") %> <%= _('made.')%> - <%= _('Joined in')%> <%= year_from_date(display_user.created_at) %>. + <%= _('Joined in')%> <%= display_user.created_at.year %>. </span> </div> diff --git a/app/views/user/show.html.erb b/app/views/user/show.html.erb index ce328b46f..7ae577565 100644 --- a/app/views/user/show.html.erb +++ b/app/views/user/show.html.erb @@ -64,7 +64,7 @@ <h1> <%= h(@display_user.name) + (@is_you ? _(" (you)") : "") %></h1> <p class="subtitle"> - <%= _('Joined {{site_name}} in', :site_name=>site_name) %> <%= year_from_date(@display_user.created_at) %> + <%= _('Joined {{site_name}} in', :site_name=>site_name) %> <%= @display_user.created_at.year %> <% if !@user.nil? && @user.admin_page_links? %> (<%= link_to "admin", admin_user_show_path(@display_user) %>) <% end %> |