[Checkins] SVN: zope.app.i18n/trunk/ Some of ZCML configuration was moved into more sane places. See previous commits and CHANGES.txt file.

[Dan Korostelev]

Log message for revision 98208:
  Some of ZCML configuration was moved into more sane places. See previous commits and CHANGES.txt file.

Changed:
  U   zope.app.i18n/trunk/CHANGES.txt
  U   zope.app.i18n/trunk/src/zope/app/i18n/configure.zcml

-=-
Modified: zope.app.i18n/trunk/CHANGES.txt
===================================================================
--- zope.app.i18n/trunk/CHANGES.txt	2009-03-17 17:23:00 UTC (rev 98207)
+++ zope.app.i18n/trunk/CHANGES.txt	2009-03-17 17:23:47 UTC (rev 98208)
@@ -2,53 +2,63 @@
 CHANGES
 =======
 
-Version 3.5.1 (unreleased)
---------------------------
+3.5.1 (unreleased)
+------------------
 
-- ...
+- Some of ZCML configuration was moved into another packages:
 
-Version 3.5.0 (2009-02-01)
---------------------------
+   * The global INegotiator utility registration was moved into ``zope.i18n``.
+   * The include of ``zope.i18n.locales`` was also moved into ``zope.i18n``.
+   * The registration of IModifiableUserPreferredLanguages adapter was moved
+     into ``zope.app.publisher``.
+   * The IAttributeAnnotation implementation statement for HTTPRequest was moved
+     into ``zope.publisher`` and will only apply if ``zope.annotation`` is
+     available.
+   * The IUserPreferredCharsets adapter registration was also moved into
+     ``zope.publisher``.
 
+3.5.0 (2009-02-01)
+------------------
+
 - Use zope.container instead of zope.app.container.
 
-Version 3.4.6 (2009-01-27)
---------------------------
+3.4.6 (2009-01-27)
+------------------
 
 - Fix a simple inconsistent MRO problem in tests
 
 - Substitute zope.app.zapi by direct calls to its wrapped apis. See bug
   219302.
 
-Version 3.4.5 (unreleased)
---------------------------
+3.4.5 (unreleased)
+------------------
 
-- This version was skipped over by accident.
+- This was skipped over by accident.
 
-Version 3.4.4 (2007-10-23)
---------------------------
+3.4.4 (2007-10-23)
+------------------
 
 - Fix deprecation warning.
 
-Version 3.4.3 (2007-10-23)
---------------------------
+3.4.3 (2007-10-23)
+------------------
 
 - Fix imports in tests.
 
 - Clean up long lines.
 
-Version 3.4.2 (2007-9-26)
--------------------------
+3.4.2 (2007-9-26)
+-----------------
 
 - Release to fix packaging issues with 3.4.1.
 
-Version 3.4.1 (2007-9-25)
--------------------------
+3.4.1 (2007-9-25)
+-----------------
 
 - Added missing Changes.txt and README.txt files to egg
 
-Version 3.4.0 (2007-9-25)
--------------------------
+3.4.0 (2007-9-25)
+-----------------
 
 - Initial documented release
 

Modified: zope.app.i18n/trunk/src/zope/app/i18n/configure.zcml
===================================================================
--- zope.app.i18n/trunk/src/zope/app/i18n/configure.zcml	2009-03-17 17:23:00 UTC (rev 98207)
+++ zope.app.i18n/trunk/src/zope/app/i18n/configure.zcml	2009-03-17 17:23:47 UTC (rev 98208)
@@ -2,31 +2,9 @@
     xmlns="http://namespaces.zope.org/zope"
     >
 
-  <!-- Setup language negotiation -->
-  <utility
-      provides="zope.i18n.interfaces.INegotiator"
-      component="zope.i18n.negotiator.negotiator"
-      />
+  <!-- BBB -->
+  <include package="zope.i18n" />
 
-  <adapter
-      factory="zope.app.publisher.browser.ModifiableBrowserLanguages"
-      for="zope.publisher.interfaces.http.IHTTPRequest"
-      provides="zope.i18n.interfaces.IModifiableUserPreferredLanguages"
-      />
-
-  <class class="zope.publisher.http.HTTPRequest">
-    <implements
-        interface="zope.annotation.interfaces.IAttributeAnnotatable"
-        />
-  </class>
-
-  <!-- Setup charset negotiation -->
-  <adapter
-      factory="zope.publisher.http.HTTPCharsets"
-      for="zope.publisher.interfaces.http.IHTTPRequest"
-      provides="zope.i18n.interfaces.IUserPreferredCharsets"
-      />
-
   <!-- Register the Translation Domain as a content object -->
   <class class=".translationdomain.TranslationDomain">
     <factory
@@ -95,7 +73,6 @@
       provides="zope.i18n.interfaces.IMessageImportFilter"
       />
 
-  <include package="zope.i18n.locales" />
   <include package=".xmlrpc" />
   <include package=".browser" />