From: Go MAEDA <maeda@farend.jp>
Date: Thu, 26 Mar 2020 05:58:47 +0000 (+0000)
Subject: Use field_activity rather than label_activity in the context of time tracking (#33186).
X-Git-Tag: 4.2.0~1131
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=795ebcc17c662c649fc8dabea4dda3cf9844393f;p=redmine.git

Use field_activity rather than label_activity in the context of time tracking (#33186).

Patch by Go MAEDA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19619 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb
index 7354c757d..4736832e2 100644
--- a/app/views/my/blocks/_timelog.html.erb
+++ b/app/views/my/blocks/_timelog.html.erb
@@ -31,7 +31,7 @@
 <%= form_tag({}, :data => {:cm_url => time_entries_context_menu_path}) do %>
 <table class="list time-entries odd-even">
 <thead><tr>
-<th><%= l(:label_activity) %></th>
+<th><%= l(:field_activity) %></th>
 <th><%= l(:label_project) %></th>
 <th><%= l(:field_comments) %></th>
 <th><%= l(:field_hours) %></th>
diff --git a/lib/redmine/helpers/time_report.rb b/lib/redmine/helpers/time_report.rb
index 75059d755..c73d30507 100644
--- a/lib/redmine/helpers/time_report.rb
+++ b/lib/redmine/helpers/time_report.rb
@@ -124,7 +124,7 @@ module Redmine
                                               :label => :label_tracker},
                                  'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
                                                :klass => TimeEntryActivity,
-                                               :label => :label_activity},
+                                               :label => :field_activity},
                                  'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
                                              :klass => Issue,
                                              :label => :label_issue}