[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/ Ported from 3.3 branch:

[Florent Xicluna]

Log message for revision 70097:
  Ported from 3.3 branch:
  - rev.68965, Log Message:
      "Added a check for those rare cases where an object is
      adaptable to IZopeDublinCore but has no metadata yet."
  - cosmetic changes (rev.69506 and rev.69635)
  
  Plus additional cosmetic.

Changed:
  U   Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml
  U   Zope3/trunk/src/zope/app/component/browser/__init__.py
  U   Zope3/trunk/src/zope/app/css/configure.zcml
  U   Zope3/trunk/src/zope/app/pagetemplate/tests/test_engine.py
  U   Zope3/trunk/src/zope/app/zopeappgenerations/evolve5.py

-=-
Modified: Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml	2006-09-10 13:49:21 UTC (rev 70096)
+++ Zope3/trunk/src/zope/app/apidoc/browser/configure.zcml	2006-09-11 08:42:45 UTC (rev 70097)
@@ -1,7 +1,7 @@
 <configure
-  xmlns="http://namespaces.zope.org/browser"
-  xmlns:zope="http://namespaces.zope.org/zope"
-  i18n_domain="zope">
+    xmlns="http://namespaces.zope.org/browser"
+    xmlns:zope="http://namespaces.zope.org/zope"
+    i18n_domain="zope">
 
   <!-- BBB 2006/02/18, to be removed after 12 months -->
   <layer
@@ -70,52 +70,52 @@
       />
 
   <pages
-    for="zope.app.apidoc.apidoc.APIDocumentation"
-    class=".apidoc.APIDocumentationView"
-    permission="zope.app.apidoc.UseAPIDoc"
-    layer=".skin.apidoc">
+      for="zope.app.apidoc.apidoc.APIDocumentation"
+      class=".apidoc.APIDocumentationView"
+      permission="zope.app.apidoc.UseAPIDoc"
+      layer=".skin.apidoc">
 
     <page
         name="index.html"
         template="index.pt" />
 
     <page
-      name="modulelist.html"
-      template="modules.pt" />
+        name="modulelist.html"
+        template="modules.pt" />
 
     <page
-      name="menu.html"
-      template="menu.pt" />
+        name="menu.html"
+        template="menu.pt" />
 
     <page
-      name="contents.html"
-      template="contents.pt" />
+        name="contents.html"
+        template="contents.pt" />
 
   </pages>
 
   <!-- Static apidoc -->
 
   <pages
-    for="zope.app.apidoc.apidoc.APIDocumentation"
-    class=".apidoc.APIDocumentationView"
-    permission="zope.app.apidoc.UseAPIDoc"
-    layer=".skin.apidoc">
+      for="zope.app.apidoc.apidoc.APIDocumentation"
+      class=".apidoc.APIDocumentationView"
+      permission="zope.app.apidoc.UseAPIDoc"
+      layer=".skin.apidoc">
 
     <page
         name="static.html"
         template="static_index.pt" />
 
     <page
-      name="staticmodulelist.html"
-      template="static_modules.pt" />
+        name="staticmodulelist.html"
+        template="static_modules.pt" />
 
     <page
-      name="staticmenu.html"
-      template="static_menu.pt" />
+        name="staticmenu.html"
+        template="static_menu.pt" />
 
     <page
-      name="staticcontents.html"
-      template="static_contents.pt" />
+        name="staticcontents.html"
+        template="static_contents.pt" />
 
   </pages>
 
@@ -158,4 +158,3 @@
       />
 
 </configure>
-

Modified: Zope3/trunk/src/zope/app/component/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/__init__.py	2006-09-10 13:49:21 UTC (rev 70096)
+++ Zope3/trunk/src/zope/app/component/browser/__init__.py	2006-09-11 08:42:45 UTC (rev 70097)
@@ -157,7 +157,7 @@
 
         """
         if ISite.providedBy(self.context):
-            raise UserError('This is already a site')
+            raise UserError(_(u'This is already a site'))
 
         # We don't want to store security proxies (we can't,
         # actually), so we have to remove proxies here before passing

Modified: Zope3/trunk/src/zope/app/css/configure.zcml
===================================================================
--- Zope3/trunk/src/zope/app/css/configure.zcml	2006-09-10 13:49:21 UTC (rev 70096)
+++ Zope3/trunk/src/zope/app/css/configure.zcml	2006-09-11 08:42:45 UTC (rev 70097)
@@ -3,7 +3,7 @@
     xmlns:browser="http://namespaces.zope.org/browser">
 
   <!-- BBB 2006/02/18, to be removed after 12 months -->
-  <browser:layer 
+  <browser:layer
       name="css"
       interface="zope.app.css.layer"
       bbb_aware="true"
@@ -14,15 +14,15 @@
       type="zope.publisher.interfaces.browser.IBrowserSkinType"
       name="CSS"
       />
-  
-  <browser:resource 
-      name="zope3.css" 
-      file="zope3.css" 
+
+  <browser:resource
+      name="zope3.css"
+      file="zope3.css"
       layer="zope.app.css.layer" />
-  
-  <browser:resource 
-      name="skin.css" 
-      file="skin.css" 
+
+  <browser:resource
+      name="skin.css"
+      file="skin.css"
       layer="zope.app.css.layer" />
 
 </configure>

Modified: Zope3/trunk/src/zope/app/pagetemplate/tests/test_engine.py
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/tests/test_engine.py	2006-09-10 13:49:21 UTC (rev 70096)
+++ Zope3/trunk/src/zope/app/pagetemplate/tests/test_engine.py	2006-09-11 08:42:45 UTC (rev 70097)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Doc tests for the pagentemplate's 'engine' module
+"""Doc tests for the pagetemplate's 'engine' module
 
 $Id$
 """

Modified: Zope3/trunk/src/zope/app/zopeappgenerations/evolve5.py
===================================================================
--- Zope3/trunk/src/zope/app/zopeappgenerations/evolve5.py	2006-09-10 13:49:21 UTC (rev 70096)
+++ Zope3/trunk/src/zope/app/zopeappgenerations/evolve5.py	2006-09-11 08:42:45 UTC (rev 70097)
@@ -39,4 +39,5 @@
             # annotations mapping) as dirty.  It contains a reference
             # to the old class path for ghosts
             annotations = IAnnotations(obj)
-            annotations[DCkey] = annotations[DCkey]
+            if DCkey in annotations:
+                annotations[DCkey] = annotations[DCkey]