[Checkins] SVN: zope.errorview/trunk/ Merge with jj-i18n branch.

[Jan-Jaap Driessen]

Log message for revision 122011:
  Merge with jj-i18n branch.

Changed:
  U   zope.errorview/trunk/buildout.cfg
  U   zope.errorview/trunk/setup.py
  U   zope.errorview/trunk/src/zope/errorview/browser.py
  U   zope.errorview/trunk/src/zope/errorview/browser.zcml
  U   zope.errorview/trunk/src/zope/errorview/http.zcml
  A   zope.errorview/trunk/src/zope/errorview/i18n/

-=-
Modified: zope.errorview/trunk/buildout.cfg
===================================================================
--- zope.errorview/trunk/buildout.cfg	2011-06-28 12:18:52 UTC (rev 122010)
+++ zope.errorview/trunk/buildout.cfg	2011-06-28 13:02:33 UTC (rev 122011)
@@ -5,6 +5,7 @@
   test
   coverage-test
   coverage-report
+  i18n
 
 [test]
 recipe = zc.recipe.testrunner
@@ -20,3 +21,14 @@
 eggs = z3c.coverage
 scripts = coverage=coverage-report
 arguments = ('coverage', 'coverage/report')
+
+[i18n]
+recipe = z3c.recipe.i18n:i18n
+eggs =
+  zope.i18n
+  zope.errorview
+packages = zope.errorview
+domain = zope.errorview
+output = src/zope/errorview/i18n/locales
+zcml =
+  <include package="zope.i18n" file="meta.zcml" />

Modified: zope.errorview/trunk/setup.py
===================================================================
--- zope.errorview/trunk/setup.py	2011-06-28 12:18:52 UTC (rev 122010)
+++ zope.errorview/trunk/setup.py	2011-06-28 13:02:33 UTC (rev 122011)
@@ -62,6 +62,8 @@
       install_requires=[
           'setuptools',
           'zope.component',
+          'zope.i18n',
+          'zope.i18nmessageid',
           'zope.interface',
           'zope.publisher',
           'zope.security',

Modified: zope.errorview/trunk/src/zope/errorview/browser.py
===================================================================
--- zope.errorview/trunk/src/zope/errorview/browser.py	2011-06-28 12:18:52 UTC (rev 122010)
+++ zope.errorview/trunk/src/zope/errorview/browser.py	2011-06-28 13:02:33 UTC (rev 122011)
@@ -18,13 +18,14 @@
 from zope.errorview.http import UnauthorizedView
 from zope.publisher.browser import BrowserPage
 
-# XXX i18n-ing?
+from zope.errorview.i18n import _
+from zope.i18n import translate
 
-
 class ExceptionView(ExceptionViewBase, BrowserPage):
 
     def render(self):
-        return u'A system error occurred.'
+        msg = _(u'A system error occurred.')
+        return translate(msg, context=self.request, default=msg)
 
 
 class NotFoundView(ExceptionViewBase, BrowserPage):
@@ -33,7 +34,8 @@
         self.request.response.setStatus(404)
 
     def render(self):
-        return u'The requested resource can not be found.'
+        msg = _(u'The requested resource can not be found.')
+        return translate(msg, context=self.request, default=msg)
 
 
 class UnauthorizedView(UnauthorizedView, BrowserPage):
@@ -54,5 +56,6 @@
 
     def render(self):
         if self.request.response.getStatus() not in (302, 303):
-            return u'Access to the requested resource is forbidden.'
+            msg = _(u'Access to the requested resource is forbidden.')
+            return translate(msg, context=self.request, default=msg)
         return ''

Modified: zope.errorview/trunk/src/zope/errorview/browser.zcml
===================================================================
--- zope.errorview/trunk/src/zope/errorview/browser.zcml	2011-06-28 12:18:52 UTC (rev 122010)
+++ zope.errorview/trunk/src/zope/errorview/browser.zcml	2011-06-28 13:02:33 UTC (rev 122011)
@@ -1,10 +1,19 @@
 <configure
   xmlns="http://namespaces.zope.org/zope"
-  xmlns:browser="http://namespaces.zope.org/browser">
+  xmlns:browser="http://namespaces.zope.org/browser"
+  xmlns:i18n="http://namespaces.zope.org/i18n"
+  i18n_domain="zope.errorview">
 
+  <include package="zope.errorview" file="http.zcml" />
+
+  <include package="zope.i18n" file="meta.zcml"/>
   <include package="zope.browserpage" file="meta.zcml" />
-  <include package="." file="http.zcml" />
 
+  <include package="zope.i18n"/>
+  <include package="zope.browserpage" />
+
+  <i18n:registerTranslations directory="i18n/locales" />
+
   <browser:page
     for="zope.interface.common.interfaces.IException"
     class=".browser.ExceptionView"

Modified: zope.errorview/trunk/src/zope/errorview/http.zcml
===================================================================
--- zope.errorview/trunk/src/zope/errorview/http.zcml	2011-06-28 12:18:52 UTC (rev 122010)
+++ zope.errorview/trunk/src/zope/errorview/http.zcml	2011-06-28 13:02:33 UTC (rev 122011)
@@ -3,8 +3,13 @@
   xmlns:browser="http://namespaces.zope.org/browser">
 
   <include package="zope.component" file="meta.zcml" />
+  <include package="zope.security" file="meta.zcml"/>
   <include package="zope.publisher" file="meta.zcml" />
 
+  <include package="zope.component"/>
+  <include package="zope.security"/>
+  <include package="zope.publisher"/>
+
   <view
     factory=".http.ExceptionView"
     for="zope.interface.common.interfaces.IException"