From: Kohei Yoshino Date: Wed, 29 May 2019 14:10:13 +0000 (-0400) Subject: Bug 1534029 - Make date-related bug field labels consistent X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ef36bd7fa64f33d3cd94fa89258d41e83bc6117;p=thirdparty%2Fbugzilla.git Bug 1534029 - Make date-related bug field labels consistent --- diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm index 4a4238eb0..f60b7fa36 100644 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@ -657,7 +657,7 @@ sub search { "Bug Number" => ["bug_id"], "Importance" => ["priority", "bug_severity"], "Assignee" => ["assigned_to", "bug_status", "priority", "bug_id"], - "Last Changed" => + "Last Updated" => ["changeddate", "bug_status", "priority", "assigned_to", "bug_id"], ); if ($order_types{$match_params->{order}}) { diff --git a/buglist.cgi b/buglist.cgi index 17abd7aea..7f40bc640 100755 --- a/buglist.cgi +++ b/buglist.cgi @@ -663,7 +663,7 @@ if ($order) { "Bug Number" => ["bug_id"], "Importance" => ["priority", "bug_severity"], "Assignee" => ["assigned_to", "bug_status", "priority", "bug_id"], - "Last Changed" => + "Last Updated" => ["changeddate", "bug_status", "priority", "assigned_to", "bug_id"], ); if ($order_types{$order}) { diff --git a/docs/en/rst/using/understanding.rst b/docs/en/rst/using/understanding.rst index 958d4baae..a98038a93 100644 --- a/docs/en/rst/using/understanding.rst +++ b/docs/en/rst/using/understanding.rst @@ -90,10 +90,10 @@ installation of Bugzilla. each non-terminal bug on the tree view, using the [-]/[+] buttons that appear before the summary. -*Reported:* +*Opened:* The person who filed the bug, and the date and time they did it. -*Modified:* +*Updated:* The date and time the bug was last changed. *CC List:* diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index 96134cfb7..548c33a36 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -524,7 +524,7 @@ [%# creation time %] [% WRAPPER bug_modal/field.html.tmpl field = bug_fields.creation_ts - label = "Reported" + label = "Opened" view_only = 1 help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#creation_ts" %] @@ -534,7 +534,7 @@ [%# last modified %] [% WRAPPER bug_modal/field.html.tmpl field = bug_fields.delta_ts - label = "Modified" + label = "Updated" view_only = 1 help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#delta_ts" %] diff --git a/extensions/LastResolved/Extension.pm b/extensions/LastResolved/Extension.pm index 798506ae9..7016b106e 100644 --- a/extensions/LastResolved/Extension.pm +++ b/extensions/LastResolved/Extension.pm @@ -27,7 +27,7 @@ sub install_update_db { if (!$last_resolved) { Bugzilla::Field->create({ name => 'cf_last_resolved', - description => 'Last Resolved', + description => 'Closed', type => FIELD_TYPE_DATETIME, mailhead => 0, enter_bug => 0, @@ -109,7 +109,7 @@ sub buglist_columns { my ($self, $args) = @_; my $columns = $args->{columns}; $columns->{'cf_last_resolved'} - = {name => 'bugs.cf_last_resolved', title => 'Last Resolved',}; + = {name => 'bugs.cf_last_resolved', title => 'Closed',}; } __PACKAGE__->NAME; diff --git a/extensions/LastResolved/template/en/default/hook/global/field-descs-end.none.tmpl b/extensions/LastResolved/template/en/default/hook/global/field-descs-end.none.tmpl index 4457ccd9b..fb1b814a1 100644 --- a/extensions/LastResolved/template/en/default/hook/global/field-descs-end.none.tmpl +++ b/extensions/LastResolved/template/en/default/hook/global/field-descs-end.none.tmpl @@ -7,5 +7,5 @@ #%] [% IF in_template_var %] - [% vars.field_descs.cf_last_resolved = "Last Resolved" %] + [% vars.field_descs.cf_last_resolved = "Closed" %] [% END %] diff --git a/query.cgi b/query.cgi index 92ef971e3..949251eb2 100755 --- a/query.cgi +++ b/query.cgi @@ -234,7 +234,7 @@ if ($userid) { # Sort order my $deforder; -my @orders = ('Bug Number', 'Importance', 'Assignee', 'Last Changed'); +my @orders = ('Bug Number', 'Importance', 'Assignee', 'Last Updated'); if ($cgi->cookie('LASTORDER')) { $deforder = "Reuse same sort as last time"; diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index a1144ddd2..0d3dd1869 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -843,7 +843,7 @@ [% BLOCK section_dates %] - Reported: + Opened: [% bug.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %] @@ -852,7 +852,7 @@ - Modified: + Updated: [% bug.delta_ts FILTER time("%Y-%m-%d %H:%M %Z") %] diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl index 96e07e58a..e458c6e4a 100644 --- a/template/en/default/global/field-descs.none.tmpl +++ b/template/en/default/global/field-descs.none.tmpl @@ -106,7 +106,7 @@ if ( $stash->get("in_template_var") ) { "bug_severity" => "Severity", "bug_status" => "Status", "bug_type" => "Type", - "changeddate" => "Changed", + "changeddate" => "Updated", "cc" => "CC", "classification" => "Classification", "cclist_accessible" => "CC list accessible", @@ -114,10 +114,10 @@ if ( $stash->get("in_template_var") ) { "component_id" => "Component ID", "component" => "Component", "content" => "Content", - "creation_ts" => "Creation date", + "creation_ts" => "Opened", "days_elapsed" => "Days since $terms->{bug} changed", "deadline" => "Deadline", - "delta_ts" => "Changed", + "delta_ts" => "Updated", "dependson" => "Depends on", "dup_id" => "Duplicate", "estimated_time" => "Orig. Est.", diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl index cf5e66ca8..97e27ba36 100644 --- a/template/en/default/request/queue.html.tmpl +++ b/template/en/default/request/queue.html.tmpl @@ -182,7 +182,7 @@ to some group are shown by default. "attachment" => "Attachment" , "requester" => "Requester" , "requestee" => "Requestee" , - "created" => "Created" , + "created" => "Opened" , "category" => "Product/Component" } %] [% DEFAULT display_columns = ["requester", "requestee", "type", "bug", "attachment", "created"] diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl index 337cbd87e..66991becf 100644 --- a/template/en/default/search/knob.html.tmpl +++ b/template/en/default/search/knob.html.tmpl @@ -37,7 +37,7 @@ "Bug Number" => "$terms.Bug Number", "Importance" => "Importance", "Assignee" => "Assignee", - "Last Changed" => "Last Changed" } %] + "Last Updated" => "Last Updated" } %] [% IF user.id %]