Bug 345113: Change the descriptions of dependson and blocked - Patch by Frédéric...

diff --git a/Bugzilla/Field.pm b/Bugzilla/Field.pm
index 5529a53f03bb0e9d4614e443a5ba7d1ff51f30f7..c6c889957c1a4c3ab8a57a0e9b3ed2a1eb670fd8 100644 (file)
--- a/Bugzilla/Field.pm
+++ b/Bugzilla/Field.pm
@@ -129,9 +129,8 @@ use constant DEFAULT_FIELDS => (
     {name => 'votes',        desc => 'Votes'},
     {name => 'qa_contact',   desc => 'QAContact',  in_new_bugmail => 1},
     {name => 'cc',           desc => 'CC',         in_new_bugmail => 1},
-    {name => 'dependson',    desc => 'BugsThisDependsOn', in_new_bugmail => 1},
-    {name => 'blocked',      desc => 'OtherBugsDependingOnThis',
-     in_new_bugmail => 1},
+    {name => 'dependson',    desc => 'Depends on', in_new_bugmail => 1},
+    {name => 'blocked',      desc => 'Blocks',     in_new_bugmail => 1},
 
     {name => 'attachments.description', desc => 'Attachment description'},
     {name => 'attachments.filename',    desc => 'Attachment filename'},
@@ -472,7 +471,7 @@ sub populate_field_definitions {
         print "New field name: " . $new_field_name . "\n";
         $dbh->do('UPDATE fielddefs SET name = ? WHERE id = ?',
                   undef, ($new_field_name, $old_field_id));
-}
+    }
 
     # This field has to be created separately, or the above upgrade code
     # might not run properly.

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index c83732ecc201fde45ce58b40b6b371b49a846c10..6039e3fe66fa34cc4173bc58e4e25f625d15b9aa 100644 (file)
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -1157,8 +1157,8 @@ our %names_to_events = (
     'Attachment description' => EVT_ATTACHMENT_DATA,
     'Attachment mime type'   => EVT_ATTACHMENT_DATA,
     'Attachment is patch'    => EVT_ATTACHMENT_DATA,
-    'BugsThisDependsOn'      => EVT_DEPEND_BLOCK,
-    'OtherBugsDependingOnThis' => EVT_DEPEND_BLOCK);
+    'Depends on'             => EVT_DEPEND_BLOCK,
+    'Blocks'                 => EVT_DEPEND_BLOCK);
 
 # Returns true if the user wants mail for a given bug change.
 # Note: the "+" signs before the constants suppress bareword quoting.