From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sun, 7 Aug 2011 00:59:24 +0000 (+0200)
Subject: Bug 288049: "internal error" from ThrowCodeError is confusing. Reword it
X-Git-Tag: bugzilla-4.3.1~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bae21652c3120afcaaa2b4fc9f8f12021dc6c5c;p=thirdparty%2Fbugzilla.git

Bug 288049: "internal error" from ThrowCodeError is confusing. Reword it
r=justdave a=LpSolit
---

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index a7962fcf46..03b58e435e 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -504,12 +504,14 @@
    admindocslinks = admindocslinks
 %]
 
+<p>
+  An unexpected error occurred. This could be a temporary problem, or some code
+  is behaving incorrectly. If this problem persists, please email this page
+  to <a href="mailto:[% Param("maintainer") %]">[% Param("maintainer") %]</a>
+  with details of what you were doing at the time this message appeared.
+</p>
+
 <tt>
-  <p>
-    [% terms.Bugzilla %] has suffered an internal error. Please save this page and send
-    it to [% Param("maintainer") %] with details of what you were doing at
-    the time this message appeared.
-  </p>
   <script type="text/javascript"> <!--
     document.write("<p>URL: " + 
                     document.location.href.replace(/&/g,"&amp;")