diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-06 11:21:10 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-12-06 11:21:10 +0000 |
| commit | 8a0a25fcebef8b08b1913181e9f82b76ad85e14e (patch) | |
| tree | 1088268008935724f5dda59ded1030d87aec5f43 /app | |
| parent | cf77c93cb4c1d8a1f941b94b8e5a9e30eb0ae179 (diff) | |
| download | redmine-8a0a25fcebef8b08b1913181e9f82b76ad85e14e.tar.gz redmine-8a0a25fcebef8b08b1913181e9f82b76ad85e14e.zip | |
Changes issue history headings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2094 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/issues/_history.rhtml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dbc016b57..0e02e5692 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -156,13 +156,13 @@ module ApplicationHelper text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>') 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 2704b6742..267263b72 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -3,7 +3,7 @@ <div id="change-<%= journal.id %>" class="journal"> <h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div> <%= content_tag('a', '', :name => "note-#{journal.indice}")%> - <%= format_time(journal.created_on) %> - <%= link_to_user(journal.user) %></h4> + <%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></h4> <%= avatar(journal.user, :size => "32") %> <ul> <% for detail in journal.details %> |