diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dbc016b5..0e02e569 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -156,13 +156,13 @@ module ApplicationHelper text.gsub(%r{(\d+)\.(\d+)}, '\1.\2') end - def authoring(created, author) + def authoring(created, author, options={}) time_tag = @project.nil? ? content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created)) : link_to(distance_of_time_in_words(Time.now, created), {:controller => 'projects', :action => 'activity', :id => @project, :from => created.to_date}, :title => format_time(created)) author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous') - l(:label_added_time_by, author_tag, time_tag) + l(options[:label] || :label_added_time_by, author_tag, time_tag) end def l_or_humanize(s, options={}) diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index 2704b674..267263b7 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -3,7 +3,7 @@

<%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %>
<%= content_tag('a', '', :name => "note-#{journal.indice}")%> - <%= format_time(journal.created_on) %> - <%= link_to_user(journal.user) %>

+ <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %> <%= avatar(journal.user, :size => "32") %>