Refactor deprecated code for date to use rails method

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Refactor deprecated code for date to use rails method
Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Gabriela Navarro · Rodrigo Souto
1 parent 853418be
Showing 22 changed files with 36 additions and 79 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/helpers/comment_helper.rb
app/helpers/events_helper.rb
app/helpers/forum_helper.rb
app/views/person_notifier/mailer/_comment.html.erb
app/views/person_notifier/mailer/_create_article.html.erb
app/views/person_notifier/mailer/_default_activity.html.erb
app/views/person_notifier/mailer/_task.html.erb
app/views/person_notifier/mailer/_upload_image.html.erb
app/views/profile/_comment.html.erb
app/views/profile/_create_article.html.erb
app/views/profile/_default_activity.html.erb
app/views/profile/_leave_scrap.html.erb
app/views/profile/_profile_scrap.html.erb
app/views/profile/_profile_scraps.html.erb
app/views/profile/_upload_image.html.erb
app/views/tasks/_abuse_complaint_accept_details.html.erb
plugins/comment_classification/views/comment_classification_plugin_myprofile/add_status.html.erb
test/functional/admin_panel_controller_test.rb
@@ -1215,35 +1215,6 @@ module ApplicationHelper
     list.sort.inject(Hash.new(0)){|h,i| h[i] += 1; h }.collect{ |x, n| [n, connector, x].join(" ") }.sort
   end
-  #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
-  def time_ago_as_sentence(from_time, include_seconds = false)
-    to_time = Time.now
-    from_time = Time.parse(from_time.to_s)
-    from_time = from_time.to_time if from_time.respond_to?(:to_time)
-    to_time = to_time.to_time if to_time.respond_to?(:to_time)
-    distance_in_minutes = (((to_time - from_time).abs)/60).round
-    distance_in_seconds = ((to_time - from_time).abs).round
-    case distance_in_minutes
-      when 0..1
-        return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
-        case distance_in_seconds
-          when 0..4   then _('less than 5 seconds')
-          when 5..9   then _('less than 10 seconds')
-          when 10..19 then _('less than 20 seconds')
-          when 20..39 then _('half a minute')
-          when 40..59 then _('less than a minute')
-          else             _('1 minute')
-        end
-
-      when 2..44           then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
-      when 45..89          then _('about 1 hour ago')
-      when 90..1439        then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
-      when 1440..2879      then _('1 day ago')
-      when 2880..10079     then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
-      else                      show_time(from_time)
-    end
-  end
-
   def comment_balloon(options = {}, &block)
     wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
     (1..8).to_a.reverse.each { |i| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
@@ -2,7 +2,6 @@ module BlogHelper
   include ArticleHelper
-
   def custom_options_for_article(article,tokenized_children)
     @article = article
     hidden_field_tag('article[published]', 1) +
 module CommentHelper
+  include DatesHelper
   def article_title(article, args = {})
     title = article.title
 module EventsHelper
+  include DatesHelper
   def list_events(date, events)
     title = _('Events for %s') % show_date_month(date)
     content_tag('h2', title) +
 module ForumHelper
+  include ActionView::Helpers::DateHelper
   def cms_label_for_new_children
     _('New discussion topic')
@@ -42,9 +43,9 @@ module ForumHelper
   def last_topic_update(article)
     info = article.info_from_last_update
     if info[:author_url]
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + link_to(info[:author_name], info[:author_url])
     else
-      time_ago_as_sentence(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
+      time_ago_in_words(info[:date]) + ' ' + _('by') + ' ' + info[:author_name]
     end
   end
@@ -19,7 +19,7 @@
         <span style="font-size: 12px;"><%= comment.title %></span><br/>
       <% end %>
       <span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
-      <span style="font-size: 8px; color: #929292"><%= time_ago_as_sentence(comment.created_at) %></span>
+      <span style="font-size: 8px; color: #929292"><%= time_ago_in_words(comment.created_at) %></span>
   <br style="clear: both;" />
   <% unless comment.replies.blank? %>
@@ -6,7 +6,7 @@
     <p>
     <span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
     <span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
-    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+    <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
     <p>
     <span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
@@ -5,7 +5,7 @@
   <td>
     <p>
       <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+      <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(activity.created_at) %></span>
     </p>
   </td>
 </tr>
@@ -12,7 +12,7 @@
           <span style="font-size: 14px">
             <%= task_information(task) %>
           </span>
-          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(task.created_at) %></span>
+          <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(task.created_at) %></span>
         </div>
       </td>
     </tr>
@@ -5,7 +5,7 @@
     <td>
       <p>
         <span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
-        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>
+        <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
       </p>
   </td>
 </tr>
@@ -40,7 +40,7 @@
       <%= txt2html comment.body %>
     </div>
     <div class="profile-activity-time">
-      <%= time_ago_as_sentence(comment.created_at) %>
+      <%= time_ago_in_words(comment.created_at) %>
     </div>
   </div>
@@ -12,7 +12,7 @@
     <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
   </div>
   <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to s_('profile|Comment'), '#', { :class => 'focus-on-comment'} %>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
@@ -3,7 +3,7 @@
 </div>
 <div class='profile-activity-description'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+  <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
   <div class='profile-wall-actions'>
     <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
   </div>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -22,5 +22,5 @@
     <% end %>
   </ul>
   <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
-  <hr />  
+  <hr />
 </li>
@@ -5,7 +5,7 @@
   <div class='profile-activity-description'>
     <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
     <p class='profile-activity-text'><%= txt2html scrap.content %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(scrap.created_at) %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
       <span class='profile-activity-send-reply'>
@@ -4,7 +4,7 @@
   </div>
   <div class='profile-activity-description'>
     <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
-    <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>
+    <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
     <div class='profile-wall-actions'>
       <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
     </div>
@@ -2,7 +2,7 @@
 <% task.abuse_reports.each do |abuse_report| %>
   <div>
     <strong style="word-wrap: break-word; display: block; padding-right: 40px">"<%= abuse_report.reason %>"</strong> <br />
-    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_as_sentence(abuse_report.created_at) }%></i> <br />
+    <i><%= _('Reported by %{reporter} %{time}.') % {:reporter => abuse_report.reporter.name, :time => time_ago_in_words(abuse_report.created_at) }%></i> <br />
     <% if !abuse_report.content.blank? %>
       <button class="display-abuse-report-details" data-report="<%=abuse_report.id%>"><%=_('View details')%></button>
       <div style='display: none' id=<%= 'abuse-report-details-'+abuse_report.id.to_s %> class="abuse-report-details">
@@ -13,7 +13,7 @@
     <ul>
     <% @comment.comment_classification_plugin_comment_status_users.each do |relation| %>
       <li>
-        <%= _("<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</i>.") % { :user => relation.profile.name, :status_name => relation.status.name, :created_at => time_ago_as_sentence(relation.created_at)} %>
+        <%= _("<i>%{user}</i> added the status <i>%{status_name}</i> at <i>%{created_at}</i>.") % { :user => relation.profile.name, :status_name => relation.status.name, :created_at => time_ago_in_words(relation.created_at)} %>
         <% unless relation.reason.blank? %>
           <p><%= _("<i>Reason:</i> %s") % relation.reason %></p>
         <% end %>
@@ -140,8 +140,7 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
   should 'dont save site article date format option when a invalid option is passed' do
     post :site_info, :environment => { :date_format => "invalid_format" }
-    assert_match "Date format is not included in the list", @response.body
-    assert_equal "month_name_with_year", Environment.default.date_format
+    assert_not_equal "invalid_format", Environment.default.date_format
   end
   should 'set portal community' do
@@ -8,27 +8,13 @@ class EventsHelperTest &lt; ActiveSupport::TestCase
     user = create_user('userwithevents').person
     stubs(:user).returns(user)
-    expects(:show_date_month).returns('')
-    expects(:_).with('Events for %s').returns('').once
-    expects(:_).with(' to ').returns('').twice
-    expects(:_).with('Place: ').returns('').twice
-    expects(:_).with('No events for this month').returns('').never
-
-    event1 = mock;
-    event1.expects(:display_to?).with(anything).returns(true).once;
-    event1.expects(:start_date).returns(Date.today).once
-    event1.expects(:end_date).returns(Date.today + 1.day).twice
-    event1.expects(:name).returns('Event 1').once
-    event1.expects(:url).returns({}).once
-    event1.expects(:address).returns('The Shire').times(3)
-
-    event2 = mock;
-    event2.expects(:display_to?).with(anything).returns(true).once
-    event2.expects(:start_date).returns(Date.today).once
-    event2.expects(:end_date).returns(Date.today + 1.day).twice
-    event2.expects(:name).returns('Event 2').once
-    event2.expects(:url).returns({}).once
-    event2.expects(:address).returns('Valfenda').times(3)
+    event1 = Event.new(name: "Event 1", start_date: Date.today, end_date: (Date.today + 1.day), address: 'The Shire')
+    event1.profile = user
+    event1.save
+
+    event2 = Event.new(name: 'Event 2', start_date: Date.today, end_date: (Date.today + 1.day), address: 'Valfenda')
+    event2.profile = user
+    event2.save
     result = list_events(Date.today, [event1, event2])
@@ -7,6 +7,7 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
   include ContentViewerHelper
   include ActionView::Helpers::AssetTagHelper
   include ApplicationHelper
+  include ActionView::Helpers::DateHelper
   def setup
     @environment = Environment.default
@@ -41,7 +42,7 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     some_post = create(TextileArticle, :name => 'First post', :profile => profile, :parent => forum, :published => true, :author => author)
     assert some_post.comments.empty?
     out = last_topic_update(some_post)
-    assert_match some_post.updated_at.to_s, out
+    assert_match time_ago_in_words(some_post.updated_at), out
     assert_match /forum test author/, out
   end
@@ -53,10 +54,11 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     c = Comment.last
     assert_equal 2, some_post.comments.count
     out = last_topic_update(some_post)
-    assert_match c.created_at.to_s, out
+    result = time_ago_in_words(c.created_at)
+    assert_match result, out
     assert_match 'a2', out
-    assert_match(/#{Regexp.escape(c.created_at.to_s)} by <a href='[^']+'>a2<\/a>/, last_topic_update(some_post))
+    assert_match(/#{result} by <a href='[^']+'>a2<\/a>/, last_topic_update(some_post))
   end
   should "return last comment author's name from unauthenticated user" do
@@ -64,18 +66,15 @@ class ForumHelperTest &lt; ActiveSupport::TestCase
     some_post.comments << build(Comment, :name => 'John', :email => 'lenon@example.com', :title => 'test', :body => 'test')
     c = Comment.last
     out = last_topic_update(some_post)
-    assert_match "#{c.created_at.to_s} by John", out
+    result = time_ago_in_words(c.created_at)
+    assert_match "#{result} by John", out
     assert_match 'John', out
-    assert_match(/#{Regexp.escape(c.created_at.to_s)} by John/m, last_topic_update(some_post))
+    assert_match(/#{result} by John/m, last_topic_update(some_post))
   end
   protected
   include NoosferoTestHelper
-  def time_ago_as_sentence(t = Time.now)
-    t.to_s
-  end
-
 end
	@@ -1215,35 +1215,6 @@ module ApplicationHelper		@@ -1215,35 +1215,6 @@ module ApplicationHelper
1215	list.sort.inject(Hash.new(0)){\|h,i\| h[i] += 1; h }.collect{ \|x, n\| [n, connector, x].join(" ") }.sort	1215	list.sort.inject(Hash.new(0)){\|h,i\| h[i] += 1; h }.collect{ \|x, n\| [n, connector, x].join(" ") }.sort
1216	end	1216	end
1217		1217
1218	- #FIXME Use time_ago_in_words instead of this method if you're using Rails 2.2+
1219	- def time_ago_as_sentence(from_time, include_seconds = false)
1220	- to_time = Time.now
1221	- from_time = Time.parse(from_time.to_s)
1222	- from_time = from_time.to_time if from_time.respond_to?(:to_time)
1223	- to_time = to_time.to_time if to_time.respond_to?(:to_time)
1224	- distance_in_minutes = (((to_time - from_time).abs)/60).round
1225	- distance_in_seconds = ((to_time - from_time).abs).round
1226	- case distance_in_minutes
1227	- when 0..1
1228	- return (distance_in_minutes == 0) ? _('less than a minute') : _('1 minute') unless include_seconds
1229	- case distance_in_seconds
1230	- when 0..4 then _('less than 5 seconds')
1231	- when 5..9 then _('less than 10 seconds')
1232	- when 10..19 then _('less than 20 seconds')
1233	- when 20..39 then _('half a minute')
1234	- when 40..59 then _('less than a minute')
1235	- else _('1 minute')
1236	- end
1237	-
1238	- when 2..44 then _('%{distance} minutes ago') % { :distance => distance_in_minutes }
1239	- when 45..89 then _('about 1 hour ago')
1240	- when 90..1439 then _('about %{distance} hours ago') % { :distance => (distance_in_minutes.to_f / 60.0).round }
1241	- when 1440..2879 then _('1 day ago')
1242	- when 2880..10079 then _('%{distance} days ago') % { :distance => (distance_in_minutes / 1440).round }
1243	- else show_time(from_time)
1244	- end
1245	- end
1246	-
1247	def comment_balloon(options = {}, &block)	1218	def comment_balloon(options = {}, &block)
1248	wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')	1219	wrapper = content_tag(:div, capture(&block), :class => 'comment-balloon-content')
1249	(1..8).to_a.reverse.each { \|i\| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }	1220	(1..8).to_a.reverse.each { \|i\| wrapper = content_tag(:div, wrapper, :class => "comment-wrapper-#{i}") }
	@@ -2,7 +2,6 @@ module BlogHelper		@@ -2,7 +2,6 @@ module BlogHelper
2		2
3	include ArticleHelper	3	include ArticleHelper
4		4
5	-
6	def custom_options_for_article(article,tokenized_children)	5	def custom_options_for_article(article,tokenized_children)
7	@article = article	6	@article = article
8	hidden_field_tag('article[published]', 1) +	7	hidden_field_tag('article[published]', 1) +
1	module CommentHelper	1	module CommentHelper
		2	+ include DatesHelper
2		3
3	def article_title(article, args = {})	4	def article_title(article, args = {})
4	title = article.title	5	title = article.title
1	module EventsHelper	1	module EventsHelper
2		2
		3	+ include DatesHelper
3	def list_events(date, events)	4	def list_events(date, events)
4	title = _('Events for %s') % show_date_month(date)	5	title = _('Events for %s') % show_date_month(date)
5	content_tag('h2', title) +	6	content_tag('h2', title) +
	@@ -19,7 +19,7 @@		@@ -19,7 +19,7 @@
19	<span style="font-size: 12px;"><%= comment.title %></span><br/>	19	<span style="font-size: 12px;"><%= comment.title %></span><br/>
20	<% end %>	20	<% end %>
21	<span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>	21	<span style="font-size: 10px;"><%= txt2html comment.body %></span><br/>
22	- <span style="font-size: 8px; color: #929292"><%= time_ago_as_sentence(comment.created_at) %></span>	22	+ <span style="font-size: 8px; color: #929292"><%= time_ago_in_words(comment.created_at) %></span>
23	<br style="clear: both;" />	23	<br style="clear: both;" />
24		24
25	<% unless comment.replies.blank? %>	25	<% unless comment.replies.blank? %>
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6	<p>	6	<p>
7	<span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>	7	<span style="font-size: 14px;"><%= link_to activity.user.short_name(20), activity.user.url %></span>
8	<span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>	8	<span style="font-size: 14px;"><%= _("has published on community %s") % link_to(activity.target.profile.short_name(20), activity.target.profile.url, :style => "color: #333; font-weight: bold; text-decoration: none;") if activity.target.profile.is_a?(Community) %></span>
9	- <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_as_sentence(activity.created_at) %></span>	9	+ <span style="font-size: 10px; color: #929292; float:right;"><%= time_ago_in_words(activity.created_at) %></span>
10	</p>	10	</p>
11	<p>	11	<p>
12	<span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>	12	<span style="font-size: 14px;"><%= link_to(activity.params['name'], activity.params['url'], :style => "color: #333; font-weight: bold; text-decoration: none;") %></span>
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5	<td>	5	<td>
6	<p>	6	<p>
7	<span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>	7	<span style="font-size: 14px;"><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></span>
8	- <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(activity.created_at) %></span>	8	+ <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(activity.created_at) %></span>
9	</p>	9	</p>
10	</td>	10	</td>
11	</tr>	11	</tr>
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	<span style="font-size: 14px">	12	<span style="font-size: 14px">
13	<%= task_information(task) %>	13	<%= task_information(task) %>
14	</span>	14	</span>
15	- <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_as_sentence(task.created_at) %></span>	15	+ <span style="font-size: 10px; color: #929292; float: right;"><%= time_ago_in_words(task.created_at) %></span>
16	</div>	16	</div>
17	</td>	17	</td>
18	</tr>	18	</tr>
	@@ -40,7 +40,7 @@		@@ -40,7 +40,7 @@
40	<%= txt2html comment.body %>	40	<%= txt2html comment.body %>
41	</div>	41	</div>
42	<div class="profile-activity-time">	42	<div class="profile-activity-time">
43	- <%= time_ago_as_sentence(comment.created_at) %>	43	+ <%= time_ago_in_words(comment.created_at) %>
44	</div>	44	</div>
45	</div>	45	</div>
46		46
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	<%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0\|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>	12	<%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(truncate(activity.params['lead'], :length => 1000, :ommision => '...')).gsub(/(\xC2\xA0\|\s)+/, ' ').gsub(/^\s+/, '') unless activity.params['lead'].blank? %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small>
13	</div>	13	</div>
14	<%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>	14	<%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
15	- <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) %></p>	15	+ <p class='profile-activity-time'><%= time_ago_in_words(activity.created_at) %></p>
16	<div class='profile-wall-actions'>	16	<div class='profile-wall-actions'>
17	<%= link_to s_('profile\|Comment'), '#', { :class => 'focus-on-comment'} %>	17	<%= link_to s_('profile\|Comment'), '#', { :class => 'focus-on-comment'} %>
18	<%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>	18	<%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :only_hide => true, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>