[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/component/ remove zope.app.i18n dep

[Bernd Dorn]

Log message for revision 73604:
  remove zope.app.i18n dep

Changed:
  U   Zope3/trunk/src/zope/app/component/back35.py
  U   Zope3/trunk/src/zope/app/component/browser/__init__.py
  U   Zope3/trunk/src/zope/app/component/browser/registration.py
  A   Zope3/trunk/src/zope/app/component/i18n.py
  U   Zope3/trunk/src/zope/app/component/interfaces/__init__.py
  U   Zope3/trunk/src/zope/app/component/metadirectives.py
  U   Zope3/trunk/src/zope/app/component/vocabulary.py

-=-
Modified: Zope3/trunk/src/zope/app/component/back35.py
===================================================================
--- Zope3/trunk/src/zope/app/component/back35.py	2007-03-25 12:12:55 UTC (rev 73603)
+++ Zope3/trunk/src/zope/app/component/back35.py	2007-03-25 12:17:44 UTC (rev 73604)
@@ -50,11 +50,10 @@
 import zope.app.container.interfaces
 import zope.app.container.constraints
 from zope.app import zapi
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.component.i18n import ZopeMessageFactory as _
 from zope.app.component.interfaces import registration as interfaces
 from zope.app.container.btree import BTreeContainer
 from zope.app.container.contained import Contained
-from zope.app.i18n import ZopeMessageFactory as _
 
 InactiveStatus = _('Inactive')
 ActiveStatus = _('Active')

Modified: Zope3/trunk/src/zope/app/component/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/__init__.py	2007-03-25 12:12:55 UTC (rev 73603)
+++ Zope3/trunk/src/zope/app/component/browser/__init__.py	2007-03-25 12:17:44 UTC (rev 73604)
@@ -28,7 +28,7 @@
 from zope.interface.interfaces import IMethod
 from zope.schema.interfaces import IField
 
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.component.i18n import ZopeMessageFactory as _
 from zope.app.container.interfaces import INameChooser
 from zope.app.container.browser.adding import Adding
 from zope.app.interface.interfaces import IInterfaceBasedRegistry

Modified: Zope3/trunk/src/zope/app/component/browser/registration.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/registration.py	2007-03-25 12:12:55 UTC (rev 73603)
+++ Zope3/trunk/src/zope/app/component/browser/registration.py	2007-03-25 12:17:44 UTC (rev 73604)
@@ -27,7 +27,7 @@
 import zope.app.pagetemplate
 import zope.app.form
 from zope.app import zapi
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.component.i18n import ZopeMessageFactory as _
 
 
 def _registrations(context, comp):

Added: Zope3/trunk/src/zope/app/component/i18n.py
===================================================================
--- Zope3/trunk/src/zope/app/component/i18n.py	2007-03-25 12:12:55 UTC (rev 73603)
+++ Zope3/trunk/src/zope/app/component/i18n.py	2007-03-25 12:17:44 UTC (rev 73604)
@@ -0,0 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2003 Zope Corporation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Customization of zope.i18n for the Zope application server
+
+$Id$
+"""
+__docformat__ = 'restructuredtext'
+
+# import this as _ to create i18n messages in the zope domain
+from zope.i18nmessageid import MessageFactory
+ZopeMessageFactory = MessageFactory('zope')


Property changes on: Zope3/trunk/src/zope/app/component/i18n.py
___________________________________________________________________
Name: svn:keywords
   + Id
Name: svn:eol-style
   + native

Modified: Zope3/trunk/src/zope/app/component/interfaces/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/component/interfaces/__init__.py	2007-03-25 12:12:55 UTC (rev 73603)
+++ Zope3/trunk/src/zope/app/component/interfaces/__init__.py	2007-03-25 12:17:44 UTC (rev 73604)
@@ -20,8 +20,7 @@
 import zope.interface
 import zope.component.interfaces
 import zope.app.container.interfaces
-import zope.app.container.constraints
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.component.i18n import ZopeMessageFactory as _
 import registration
 
 import zope.deferredimport

Modified: Zope3/trunk/src/zope/app/component/metadirectives.py
===================================================================
--- Zope3/trunk/src/zope/app/component/metadirectives.py	2007-03-25 12:12:55 UTC (rev 73603)
+++ Zope3/trunk/src/zope/app/component/metadirectives.py	2007-03-25 12:17:44 UTC (rev 73604)
@@ -24,7 +24,7 @@
 from zope.component.zcml import IBasicComponentInformation
 
 from zope.app.component.back35 import LayerField
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.component.i18n import ZopeMessageFactory as _
 
 class IDefaultViewName(zope.interface.Interface):
     """A string that contains the default view name

Modified: Zope3/trunk/src/zope/app/component/vocabulary.py
===================================================================
--- Zope3/trunk/src/zope/app/component/vocabulary.py	2007-03-25 12:12:55 UTC (rev 73603)
+++ Zope3/trunk/src/zope/app/component/vocabulary.py	2007-03-25 12:17:44 UTC (rev 73604)
@@ -26,7 +26,7 @@
 from zope.schema.interfaces import IVocabulary, IVocabularyTokenized
 from zope.schema.interfaces import ITokenizedTerm, IVocabularyFactory
 
-from zope.app.i18n import ZopeMessageFactory as _
+from zope.app.component.i18n import ZopeMessageFactory as _
 from zope.app.interface.vocabulary import ObjectInterfacesVocabulary
 from zope.component.interfaces import IUtilityRegistration