Bug 182939 : Remove the word 'Additional' from 'Additional Comments'

Patch by Shane H. W. Travis <travis@sedsystems.ca>   r=myk  a=myk

diff --git a/globals.pl b/globals.pl
index 1bfbe2306957f14cef01deb0463f4f7bbcf470b7..9ec915792d7ecaa05e3085596c5d31a2ba475213 100644 (file)
--- a/globals.pl
+++ b/globals.pl
@@ -967,8 +967,8 @@ sub GetLongDescriptionAsText {
                    "AND    longdescs.bug_id = $id ");
 
     if ($start && $start =~ /[1-9]/) {
-        # If the start is all zeros, then don't do this (because we want to
-        # not emit a leading "Additional Comments" line in that case.)
+        # If $start is not all zeros, obtain the count-index
+        # of this comment for the leading "Comment #xxx" line.)
         $query .= "AND longdescs.bug_when > '$start'";
         SendSQL("SELECT count(*) FROM longdescs WHERE bug_id = $id AND bug_when <= '$start'");
         ($count) = (FetchSQLData());
@@ -983,7 +983,7 @@ sub GetLongDescriptionAsText {
         my ($who, $when, $text, $isprivate, $work_time, $already_wrapped) = 
             (FetchSQLData());
         if ($count) {
-            $result .= "\n\n------- Additional comment #$count from $who".Param('emailsuffix')."  ".
+            $result .= "\n\n------- Comment #$count from $who".Param('emailsuffix')."  ".
                 Bugzilla::Util::format_time($when) . " -------\n";
         }
         if (($isprivate > 0) && Param("insidergroup")) {

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 008da01a09a299f8a76ea44794ffb2f52200eb3e..7a9dfb4efe7c9fad507b762ecf8133be5cfeb6d3 100644 (file)
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -49,7 +49,7 @@
       [% IF count > 0 %]
         <br>
         <span class="bz_comment">
-          ------- <i>Additional Comment
+          ------- <i>Comment
           <a name="c[% count %]" href="#c[% count %]">#[% count %]</a> From 
           <a href="mailto:[% comment.email FILTER html %]">
             [% comment.name FILTER html %]</a>

diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index eaad633c2beb0ecec167e178969a6d37e6d85ab7..491e5b269332a0d050fc4ede47863bafb723135d 100644 (file)
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -53,7 +53,7 @@
 
 [% IF comments.size > start_at %]
 <p>
-  Added comments:
+  Added the comment(s):
   <blockquote>
     [% PROCESS "bug/comments.html.tmpl" %]
   </blockquote>
@@ -61,7 +61,7 @@
 [% END %]
 
 <p>
-  Your additional comment was:<br>
+  Your comment was:<br>
   <blockquote><pre>[% form.comment FILTER html %]</pre></blockquote>
 </p>