[Zope-Checkins] CVS: Zope2 - HTTPResponse.py:1.40.8.4

Sat, 7 Apr 2001 11:56:41 -0400 (EDT)

Update of /cvs-repository/Zope2/lib/python/ZPublisher
In directory korak:/tmp/cvs-serv6787

Modified Files:
      Tag: zope-2_3-branch
	HTTPResponse.py 
Log Message:
De-Zopified error messages.

--- Updated File HTTPResponse.py in package Zope2 --
--- HTTPResponse.py	2001/02/12 18:53:20	1.40.8.3
+++ HTTPResponse.py	2001/04/07 15:56:40	1.40.8.4
@@ -498,7 +498,7 @@
         # XXX could this try to use standard_error_message somehow?
         return ("""\
 <HTML>
-<HEAD><TITLE>Zope Error</TITLE></HEAD>
+<HEAD><TITLE>Site Error</TITLE></HEAD>
 <BODY>
 
 <TABLE BORDER="0" WIDTH="100%">
@@ -509,8 +509,8 @@
 </TD>
 
 <TD WIDTH="90%">
-  <H2>Zope Error</H2>
-  <P>Zope has encountered an error while publishing this resource.
+  <H2>Site Error</H2>
+  <P>An error was encountered while publishing this resource.
   </P>""" + \
   """
   <P><STRONG>%s</STRONG></P>
@@ -544,7 +544,7 @@
         self.setStatus(404)
         raise 'NotFound',self._error_html(
             "Resource not found",
-            "Sorry, the requested Zope resource does not exist.<p>" +
+            "Sorry, the requested resource does not exist.<p>" +
             "Check the URL and try again.<p>" +
             "\n<!--\n%s\n-->" % entry)
 
@@ -562,7 +562,7 @@
         if regex.match('^[A-Z_0-9]+$',name) >= 0:
             raise 'InternalError', self._error_html(
                 "Internal Error",
-                "Sorry, an internal error occurred in this Zope resource.")
+                "Sorry, an internal error occurred in this resource.")
 
         raise 'BadRequest',self._error_html(
             "Invalid request",
@@ -661,7 +661,7 @@
         elif type(b) is not types.StringType or tag_search(b) is None:
             tb=self.setBody(
                 (str(t),
-                'Sorry, a Zope error occurred.<p>'+
+                'Sorry, a site error occurred.<p>'+
                  self._traceback(t,v,tb)),
                  is_error=1)
 



