[Zope-Checkins] SVN: Zope/trunk/ Moved ``Products/Five/i18n.zcml`` into the ZPublisher package.

[Hanno Schlichting]

Log message for revision 102393:
  Moved ``Products/Five/i18n.zcml`` into the ZPublisher package.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/src/Products/Five/configure.zcml
  U   Zope/trunk/src/Products/Five/i18n.zcml
  U   Zope/trunk/src/ZPublisher/configure.zcml
  A   Zope/trunk/src/ZPublisher/i18n.zcml

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===================================================================
--- Zope/trunk/doc/CHANGES.rst	2009-07-30 19:40:57 UTC (rev 102392)
+++ Zope/trunk/doc/CHANGES.rst	2009-07-30 19:51:52 UTC (rev 102393)
@@ -14,6 +14,8 @@
 - Moved zope.security-style permission registrations from Products.Five into
   the AccessControl package.
 
+- Moved ``Products/Five/i18n.zcml`` into the ZPublisher package.
+
 - Moved ``Products/Five/publisher.zcml`` into the ZPublisher package.
 
 - Moved ``Products/Five/event.zcml`` into the OFS package.

Modified: Zope/trunk/src/Products/Five/configure.zcml
===================================================================
--- Zope/trunk/src/Products/Five/configure.zcml	2009-07-30 19:40:57 UTC (rev 102392)
+++ Zope/trunk/src/Products/Five/configure.zcml	2009-07-30 19:51:52 UTC (rev 102393)
@@ -3,7 +3,6 @@
 
   <include file="meta.zcml" />
   <include file="permissions.zcml" />
-  <include file="i18n.zcml" />
   <include file="deprecated.zcml"/>
   <include file="traversing.zcml"/>
 

Modified: Zope/trunk/src/Products/Five/i18n.zcml
===================================================================
--- Zope/trunk/src/Products/Five/i18n.zcml	2009-07-30 19:40:57 UTC (rev 102392)
+++ Zope/trunk/src/Products/Five/i18n.zcml	2009-07-30 19:51:52 UTC (rev 102393)
@@ -1,23 +1,6 @@
 <configure
-    xmlns="http://namespaces.zope.org/zope"
-    xmlns:i18n="http://namespaces.zope.org/i18n"
-    >
+    xmlns="http://namespaces.zope.org/zope">
 
-  <utility 
-      provides="zope.i18n.interfaces.INegotiator"
-      component="zope.i18n.negotiator.negotiator"
-      />
+  <include package="ZPublisher" file="i18n.zcml" />
 
-  <adapter
-      for="zope.publisher.interfaces.http.IHTTPRequest"
-      provides="zope.i18n.interfaces.IUserPreferredLanguages"
-      factory="zope.publisher.browser.BrowserLanguages"
-      />
-
-  <adapter
-      for="zope.publisher.interfaces.http.IHTTPRequest"
-      provides="zope.i18n.interfaces.IUserPreferredCharsets"
-      factory="zope.publisher.http.HTTPCharsets"
-      />
-
 </configure>

Modified: Zope/trunk/src/ZPublisher/configure.zcml
===================================================================
--- Zope/trunk/src/ZPublisher/configure.zcml	2009-07-30 19:40:57 UTC (rev 102392)
+++ Zope/trunk/src/ZPublisher/configure.zcml	2009-07-30 19:51:52 UTC (rev 102393)
@@ -1,5 +1,6 @@
 <configure xmlns="http://namespaces.zope.org/zope">
 
+  <include file="i18n.zcml"/>
   <include file="publisher.zcml"/>
 
 </configure>

Copied: Zope/trunk/src/ZPublisher/i18n.zcml (from rev 102379, Zope/trunk/src/Products/Five/i18n.zcml)
===================================================================
--- Zope/trunk/src/ZPublisher/i18n.zcml	                        (rev 0)
+++ Zope/trunk/src/ZPublisher/i18n.zcml	2009-07-30 19:51:52 UTC (rev 102393)
@@ -0,0 +1,22 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:i18n="http://namespaces.zope.org/i18n">
+
+  <utility 
+      provides="zope.i18n.interfaces.INegotiator"
+      component="zope.i18n.negotiator.negotiator"
+      />
+
+  <adapter
+      for="zope.publisher.interfaces.http.IHTTPRequest"
+      provides="zope.i18n.interfaces.IUserPreferredLanguages"
+      factory="zope.publisher.browser.BrowserLanguages"
+      />
+
+  <adapter
+      for="zope.publisher.interfaces.http.IHTTPRequest"
+      provides="zope.i18n.interfaces.IUserPreferredCharsets"
+      factory="zope.publisher.http.HTTPCharsets"
+      />
+
+</configure>