[Zope3-checkins] CVS: Zope3/src/zope/app/services/translation - filters.py:1.2 messagecatalog.py:1.4 translationservice.py:1.6

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zope/app/services/translation
In directory cvs.zope.org:/tmp/cvs-serv19100/src/zope/app/services/translation

Modified Files:
	filters.py messagecatalog.py translationservice.py 
Log Message:
Refactored the translation service interfaces and updated all the
tests.


=== Zope3/src/zope/app/services/translation/filters.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/services/translation/filters.py:1.1	Tue Mar 25 13:21:35 2003
+++ Zope3/src/zope/app/services/translation/filters.py	Tue Mar 25 18:25:12 2003
@@ -20,13 +20,13 @@
 
 from zope.i18n.interfaces import IMessageExportFilter
 from zope.i18n.interfaces import IMessageImportFilter
-from zope.i18n.interfaces import IWriteTranslationService
+from zope.app.interfaces.services.translation import ILocalTranslationService
 
 
 class GettextExportFilter:
 
     __implements__ =  IMessageExportFilter
-    __used_for__ = IWriteTranslationService
+    __used_for__ = ILocalTranslationService
 
 
     def __init__(self, service):
@@ -72,7 +72,7 @@
 class GettextImportFilter:
 
     __implements__ =  IMessageImportFilter
-    __used_for__ = IWriteTranslationService
+    __used_for__ = ILocalTranslationService
 
 
     def __init__(self, service):


=== Zope3/src/zope/app/services/translation/messagecatalog.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/services/translation/messagecatalog.py:1.3	Mon Dec 30 21:52:05 2002
+++ Zope3/src/zope/app/services/translation/messagecatalog.py	Tue Mar 25 18:25:12 2003
@@ -22,12 +22,12 @@
 from zope.proxy.introspection import removeAllProxies
 from zope.component.interfaces import IFactory
 from zope.app.security.registries.registeredobject import RegisteredObject
-from zope.i18n.interfaces import IMessageCatalog
+from zope.app.interfaces.services.translation import ILocalMessageCatalog
 
 
 class MessageCatalog(RegisteredObject, Persistent):
 
-    __implements__ =  IMessageCatalog
+    __implements__ =  ILocalMessageCatalog
     __class_implements__ = IFactory
 
     def __init__(self, language, domain="default"):


=== Zope3/src/zope/app/services/translation/translationservice.py 1.5 => 1.6 ===
--- Zope3/src/zope/app/services/translation/translationservice.py:1.5	Tue Mar 11 11:11:35 2003
+++ Zope3/src/zope/app/services/translation/translationservice.py	Tue Mar 25 18:25:12 2003
@@ -30,14 +30,9 @@
 from zope.app.interfaces.services.service import ISimpleService
 
 from zope.i18n.negotiator import negotiator
-from zope.i18n.domain import Domain
 from zope.i18n.interfaces import IMessageCatalog
-from zope.i18n.interfaces import ITranslationService
+from zope.app.interfaces.services.translation import ILocalTranslationService
 from zope.i18n.simpletranslationservice import SimpleTranslationService
-
-
-class ILocalTranslationService(ITranslationService, IContainer):
-    """TTW manageable translation service"""
 
 
 class TranslationService(BTreeContainer, SimpleTranslationService):