Bug 479164: "Bug" appears raw in "File a Bug" on index.cgi - Patch by Frédéric...

diff --git a/t/009bugwords.t b/t/009bugwords.t
index 8abbe16061319d2fc5374dd54228f62c8221b14e..242ac478dc4f1919dee19b4eaaf4d40087b7688e 100644 (file)
--- 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 4fa60894a794e42d112c211f018233e2f3531a86..dd7281e6856801b951af8ebaae27fa363de7e3d6 100644 (file)
--- 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 2039318a77fb5ecfd0e41fdcd0b0e74f17ece53e..339975d67b4cd93eee7ee4b72dff71a77b4debbb 100644 (file)
--- 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 186e56085b7ff80d2f1d78cba5d196e9ad1c7d39..181ac82a146aaf4b1c9de771967569fedf2c24be 100644 (file)
--- 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>