summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--globals.pl6
-rw-r--r--template/en/default/bug/comments.html.tmpl2
-rw-r--r--template/en/default/bug/process/midair.html.tmpl4
3 files changed, 6 insertions, 6 deletions
diff --git a/globals.pl b/globals.pl
index 1bfbe2306..9ec915792 100644
--- 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 008da01a0..7a9dfb4ef 100644
--- 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 eaad633c2..491e5b269 100644
--- 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>