[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/ Merge r27091 from trunk: Fix collector issue 260

[Philipp von Weitershausen]

Log message for revision 27092:
  Merge r27091 from trunk: Fix collector issue 260
  


Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/configure.zcml
  U   Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/translationdomain.py


-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/configure.zcml
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/configure.zcml	2004-08-13 01:22:21 UTC (rev 27091)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/configure.zcml	2004-08-13 01:33:06 UTC (rev 27092)
@@ -49,22 +49,17 @@
 
 <!-- Setup Message Catalogs -->
 <content class=".messagecatalog.MessageCatalog">
+  <factory id="zope.app.MessageCatalog" />
+  <implements 
+      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 
   <require permission="zope.View" 
       interface="zope.i18n.interfaces.IMessageCatalog" />
-
   <require permission="zope.ManageServices"
       attributes="setMessage getMessageIds" />
-  <implements 
-      interface="zope.app.annotation.interfaces.IAttributeAnnotatable" />
 </content>
 
-<factory 
-    component="zope.app.i18n.messagecatalog.MessageCatalog" 
-    id="zope.app.MessageCatalog"
-    />
 
-
 <!-- Setup Export and Import Filters -->
 <adapter 
     factory=".filters.GettextExportFilter"

Modified: Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/translationdomain.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/translationdomain.py	2004-08-13 01:22:21 UTC (rev 27091)
+++ Zope3/branches/ZopeX3-3.0/src/zope/app/i18n/translationdomain.py	2004-08-13 01:33:06 UTC (rev 27092)
@@ -166,7 +166,8 @@
 
     def addLanguage(self, language):
         'See IWriteTranslationService'
-        catalog = zapi.createObject(None, 'Message Catalog', language)
+        catalog = zapi.createObject(None, u'zope.app.MessageCatalog',
+                                    language)
         self[language] = catalog