diff options
| -rw-r--r-- | app/helpers/date_time_helper.rb | 14 | ||||
| -rw-r--r-- | app/views/user/_user_listing_single.html.erb | 2 | ||||
| -rw-r--r-- | app/views/user/show.html.erb | 2 | ||||
| -rw-r--r-- | spec/helpers/date_time_helper_spec.rb | 17 |
4 files changed, 2 insertions, 33 deletions
diff --git a/app/helpers/date_time_helper.rb b/app/helpers/date_time_helper.rb index f8d4b3611..5f129e590 100644 --- a/app/helpers/date_time_helper.rb +++ b/app/helpers/date_time_helper.rb @@ -66,18 +66,4 @@ module DateTimeHelper def simple_time(date) date.strftime("%H:%M:%S").strip end - - # Return the year component from a date - # - # date - a DateTime, Date or Time - # - # Examples - # - # year_from_date(Date.new(2012, 11, 21)) - # # => "2012" - # - # Returns a String - def year_from_date(date) - date.strftime("%Y").strip - end end 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 %> diff --git a/spec/helpers/date_time_helper_spec.rb b/spec/helpers/date_time_helper_spec.rb index 870deb2d0..c4fdee1d1 100644 --- a/spec/helpers/date_time_helper_spec.rb +++ b/spec/helpers/date_time_helper_spec.rb @@ -68,21 +68,4 @@ describe DateTimeHelper do end end - - describe :year_from_date do - - it 'returns the year component of a date' do - year_from_date(Date.new(2012, 11, 21)).should == '2012' - end - - it 'returns the year component of a datetime' do - year_from_date(DateTime.new(2012, 11, 21)).should == '2012' - end - - it 'returns the year component of a time' do - year_from_date(Time.now).should == Date.today.year.to_s - end - - end - end |