[Zope3-checkins] CVS: Zope3/src/zope/app/services/translation - configure.zcml:1.3 gettextexportfilter.py:1.3 gettextimportfilter.py:1.3 messagecatalog.py:1.3 translationservice.py:1.3

[Jim Fulton]

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

Modified Files:
	configure.zcml gettextexportfilter.py gettextimportfilter.py 
	messagecatalog.py translationservice.py 
Log Message:
Moved some missplaced interface files.


=== Zope3/src/zope/app/services/translation/configure.zcml 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/translation/configure.zcml:1.2	Wed Dec 25 09:13:21 2002
+++ Zope3/src/zope/app/services/translation/configure.zcml	Mon Dec 30 21:52:05 2002
@@ -8,25 +8,25 @@
 <content class="zope.app.services.translation.translationservice.TranslationService">
    <factory id="TranslationService" permission="zope.ManageServices" />
    <require permission="zope.Public"
-       interface="zope.interfaces.i18n.ITranslationService" />
+       interface="zope.i18n.interfaces.ITranslationService" />
    <require permission="zope.ManageServices"
        interface="zope.app.interfaces.container.IContainer" />
    <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
 </content>
 
-<browser:icon name="zmi_icon" for="zope.interfaces.i18n.ITranslationService"
+<browser:icon name="zmi_icon" for="zope.i18n.interfaces.ITranslationService"
     file="./i18n_service.gif" />
 
 <!-- Setup Message Catalogs -->
 <content class="zope.app.services.translation.messagecatalog.MessageCatalog">
 
   <require permission="zope.View" 
-      interface="zope.interfaces.i18n.IReadMessageCatalog" />
+      interface="zope.i18n.interfaces.IReadMessageCatalog" />
 
   <require permission="zope.ManageServices"
       attributes="setMessage getMessageIds" />
   <implements interface="zope.app.interfaces.annotation.IAttributeAnnotatable" />
-      interface="zope.interfaces.i18n.IWriteMessageCatalog" />
+      interface="zope.i18n.interfaces.IWriteMessageCatalog" />
 
 
 </content>
@@ -35,12 +35,12 @@
 
 <!-- Setup Export and Import Filters -->
 <adapter factory="zope.app.services.translation.gettextexportfilter.GettextExportFilter"
-    for="zope.interfaces.i18n.IWriteTranslationService"
-    provides="zope.interfaces.i18n.IMessageExportFilter" />
+    for="zope.i18n.interfaces.IWriteTranslationService"
+    provides="zope.i18n.interfaces.IMessageExportFilter" />
 
 <adapter factory="zope.app.services.translation.gettextimportfilter.GettextImportFilter"
-    for="zope.interfaces.i18n.IWriteTranslationService"
-    provides="zope.interfaces.i18n.IMessageImportFilter" />
+    for="zope.i18n.interfaces.IWriteTranslationService"
+    provides="zope.i18n.interfaces.IMessageImportFilter" />
 
 <gts:registerTranslations directory="./locale" />
 <gts:defaultLanguages languages="en" />


=== Zope3/src/zope/app/services/translation/gettextexportfilter.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/translation/gettextexportfilter.py:1.2	Wed Dec 25 09:13:21 2002
+++ Zope3/src/zope/app/services/translation/gettextexportfilter.py	Mon Dec 30 21:52:05 2002
@@ -18,8 +18,8 @@
 import time
 from types import StringTypes
 
-from zope.interfaces.i18n import IMessageExportFilter
-from zope.interfaces.i18n import IWriteTranslationService
+from zope.i18n.interfaces import IMessageExportFilter
+from zope.i18n.interfaces import IWriteTranslationService
 
 
 class GettextExportFilter:


=== Zope3/src/zope/app/services/translation/gettextimportfilter.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/translation/gettextimportfilter.py:1.2	Wed Dec 25 09:13:21 2002
+++ Zope3/src/zope/app/services/translation/gettextimportfilter.py	Mon Dec 30 21:52:05 2002
@@ -18,8 +18,8 @@
 import time, re
 from types import StringTypes
 
-from zope.interfaces.i18n import IMessageImportFilter
-from zope.interfaces.i18n import IWriteTranslationService
+from zope.i18n.interfaces import IMessageImportFilter
+from zope.i18n.interfaces import IWriteTranslationService
 
 
 class GettextImportFilter:


=== Zope3/src/zope/app/services/translation/messagecatalog.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/translation/messagecatalog.py:1.2	Wed Dec 25 09:13:21 2002
+++ Zope3/src/zope/app/services/translation/messagecatalog.py	Mon Dec 30 21:52:05 2002
@@ -22,7 +22,7 @@
 from zope.proxy.introspection import removeAllProxies
 from zope.component.interfaces import IFactory
 from zope.app.security.registries.registeredobject import RegisteredObject
-from zope.interfaces.i18n import IMessageCatalog
+from zope.i18n.interfaces import IMessageCatalog
 
 
 class MessageCatalog(RegisteredObject, Persistent):


=== Zope3/src/zope/app/services/translation/translationservice.py 1.2 => 1.3 ===
--- Zope3/src/zope/app/services/translation/translationservice.py:1.2	Wed Dec 25 09:13:21 2002
+++ Zope3/src/zope/app/services/translation/translationservice.py	Mon Dec 30 21:52:05 2002
@@ -29,8 +29,8 @@
 
 from zope.i18n.negotiator import negotiator
 from zope.i18n.domain import Domain
-from zope.interfaces.i18n import IMessageCatalog
-from zope.interfaces.i18n import ITranslationService
+from zope.i18n.interfaces import IMessageCatalog
+from zope.i18n.interfaces import ITranslationService
 from zope.i18n.simpletranslationservice import SimpleTranslationService