summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2009-02-25 20:24:46 +0100
committerlpsolit%gmail.com <>2009-02-25 20:24:46 +0100
commitba04de6f7d1ad111b61e492f5af9c0fd6145d08d (patch)
treeaa5b009390a0d46fa83993c80136739f74b69742
parent51c13dbeddd73ef4dd056a2e297696abe7d9e774 (diff)
downloadbugzilla-ba04de6f7d1ad111b61e492f5af9c0fd6145d08d.tar.gz
bugzilla-ba04de6f7d1ad111b61e492f5af9c0fd6145d08d.tar.xz
Bug 479164: "Bug" appears raw in "File a Bug" on index.cgi - Patch by Frédéric Buclin <LpSolit@gmail.com> r=ghendricks a=LpSolit
-rw-r--r--t/009bugwords.t2
-rw-r--r--template/en/default/global/variables.none.tmpl1
-rw-r--r--template/en/default/index.html.tmpl2
-rw-r--r--template/en/default/pages/release-notes.html.tmpl3
4 files changed, 4 insertions, 4 deletions
diff --git a/t/009bugwords.t b/t/009bugwords.t
index 8abbe1606..242ac478d 100644
--- a/t/009bugwords.t
+++ b/t/009bugwords.t
@@ -68,7 +68,7 @@ foreach my $file (@testitems) {
my $lineno = scalar(@lineno) + 1;
# "a bug", "bug", "bugs"
- if (grep /(a?[\s>]bugs?[\s.:;,])/i, $text) {
+ if (grep /(a?[\s>]bugs?[\s.:;,<])/i, $text) {
# Exclude variable assignment.
unless (grep /bugs =/, $text) {
push(@errors, [$lineno, $text]);
diff --git a/template/en/default/global/variables.none.tmpl b/template/en/default/global/variables.none.tmpl
index 4fa60894a..dd7281e68 100644
--- a/template/en/default/global/variables.none.tmpl
+++ b/template/en/default/global/variables.none.tmpl
@@ -32,6 +32,7 @@
"Bug" => "Bug",
"abug" => "a bug",
"Abug" => "A bug",
+ "aBug" => "a Bug",
"ABug" => "A Bug",
"bugs" => "bugs",
"Bugs" => "Bugs",
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 2039318a7..339975d67 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -130,7 +130,7 @@ YAHOO.util.Event.onDOMReady(onLoadActions);
<h1 id="welcome"> Welcome to [% terms.Bugzilla %]</h1>
<a href="enter_bug.cgi" class="bz_common_actions">
<div class="bz_common_actions" id="enter_bug">
- <span>File a Bug</span>
+ <span>File [% terms.aBug %]</span>
</div>
</a>
diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl
index 186e56085..181ac82a1 100644
--- a/template/en/default/pages/release-notes.html.tmpl
+++ b/template/en/default/pages/release-notes.html.tmpl
@@ -1467,8 +1467,7 @@
mailing list if you write a plugin.</p>
<p>If you need more hooks, please
- <a href="http://www.bugzilla.org/developers/reporting_bugs.html">File a
- bug</a>!</p>
+ <a href="http://www.bugzilla.org/developers/reporting_bugs.html">File a b<!-- -->ug</a>!</p>
<h3><a name="v30_code_api"></a>API Documentation</h3>