From 0e2a60dc182c15159110e996b370fe1640af0fa4 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Wed, 18 Apr 2007 05:13:22 +0000
Subject: Bug 350112: Error about "data/bugzilla-update.xml" being unreadable -
 Patch by Frédéric Buclin <LpSolit@gmail.com> r=kevin.benton r=mkanat
 a=LpSolit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/en/default/admin/params/core.html.tmpl | 5 +++++
 template/en/default/index.html.tmpl             | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'template/en/default')

diff --git a/template/en/default/admin/params/core.html.tmpl b/template/en/default/admin/params/core.html.tmpl
index 2ab6856a8..9ad312cfb 100644
--- a/template/en/default/admin/params/core.html.tmpl
+++ b/template/en/default/admin/params/core.html.tmpl
@@ -89,6 +89,11 @@
                   "centered text, use <em>style=\"text-align: " _
                   "center;\"</em>.",
 
+  proxy_url => "$terms.Bugzilla may have to access the web to get notifications about new " _
+               "releases, see the <tt>upgrade_notification</tt> parameter. In case you are " _
+               "behind a proxy, it may be necessary to enter its URL if the web server " _
+               "group cannot access the HTTP_PROXY environment variable.",
+
   upgrade_notification => "<p>$terms.Bugzilla can inform you when a new release is available. " _
                           "The notification will appear on the $terms.Bugzilla homepage, " _
                           "for administrators only.</p>" _
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index a96f2b15e..d7c74e188 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -75,12 +75,18 @@ function addSidebar() {
       <p class="notice">This message is only shown to logged in users with admin privs.
       You can configure this notification from the
       <a href="editparams.cgi?section=core#upgrade_notification">Parameters</a> page.</p>
+    [% ELSIF release.error == "missing_package" %]
+      <p>Missing package '[% release.package FILTER html %]'. This package is required to
+      <a href="editparams.cgi?section=core#upgrade_notification">notify you about new releases</a>.</p>
+    [% ELSIF release.error == "cannot_download" %]
+      <p>The local XML file '[% release.xml_file FILTER html %]' cannot be created.
+      Please make sure the web server can write in this directory.</p>
     [% ELSIF release.error == "no_update" %]
       <p>The local XML file '[% release.xml_file FILTER html %]' cannot be updated.
       Please make sure the web server can edit this file.</p>
     [% ELSIF release.error == "no_access" %]
       <p>The local XML file '[% release.xml_file FILTER html %]' cannot be read.
-      Please make sure this file exists and has the correct rights set on it.</p>
+      Please make sure this file has the correct rights set on it.</p>
     [% ELSIF release.error == "corrupted" %]
       <p>The local XML file '[% release.xml_file FILTER html %]' has an invalid XML format.
       Please delete it and try accessing this page again.</p>
-- 
cgit v1.2.3-24-g4f1b