Bug 1534029 - Make date-related bug field labels consistent

diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm
index 4a4238eb060f218fcf37980c896efe8621f15468..f60b7fa36fa62be18ad966002038b18be0e3b101 100644 (file)
--- 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 17abd7aeafbc71e6206277868940cbc2173c902a..7f40bc6402f0b5bef1ea1e8732f0dbfff4ee4565 100755 (executable)
--- 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 958d4baae519e2ba4aabf8c5f567a8a85cf16fca..a98038a93c2c99850f59e9e1614ae339e72e4582 100644 (file)
--- 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 96134cfb7b32db0d4e820817c914ed540ffdf883..548c33a36eff3b51c6a615d59285fe37e634d1dc 100644 (file)
--- 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 798506ae9f9c57c827613c4dac4432b01a03aec8..7016b106e189a069d7f237287a6bf2ff18b9d89c 100644 (file)
--- 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 4457ccd9b7b286717d298fea14a1fcd9de514b26..fb1b814a1054413d4054cdea7c9372d6db1a11c4 100644 (file)
--- 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 92ef971e3e19f5346137da2bfefa63e7c4a6ec21..949251eb2281eb6996371f32632fb3b9fc466c78 100755 (executable)
--- 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 a1144ddd20e7ed949604da33f4f0f9d655bd1b77..0d3dd18695d65cdfd833cdc7c94bde41c214ee07 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -843,7 +843,7 @@
 [% BLOCK section_dates %]
   <tr>
     <th class="field_label">
-      Reported:
+      Opened:
     </th>
     <td>
      [% bug.creation_ts FILTER time("%Y-%m-%d %H:%M %Z") %] by [% INCLUDE global/user.html.tmpl who = bug.reporter %]
@@ -852,7 +852,7 @@
 
   <tr>
     <th class="field_label">
-      Modified:
+      Updated:
     </th>
     <td>
       [% 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 96e07e58ab5960b4022c16fd5cc88a6bb0997064..e458c6e4a640099b9fa4f06139916cdc3af23434 100644 (file)
--- 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 cf5e66ca89770adfb208f13c2bdbbfc8a4d1a899..97e27ba36143cf0f159946476e6dc52a9b67144d 100644 (file)
--- 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 337cbd87ed69a0bcab38e47722880a6d36d2ef42..66991becf0858a536c56a7b0f73df575b1ec7d6c 100644 (file)
--- 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" } %]
 
 <input type="hidden" name="cmdtype" value="doit">
 [% IF user.id %]