[Zope3-checkins] SVN: Zope3/branches/3.3/src/zope/formlib/ domain in zope.formlib changed from "zope.formlib" to "zope"

[Egon Frerich]

Log message for revision 68116:
  domain in zope.formlib changed from "zope.formlib" to "zope"

Changed:
  U   Zope3/branches/3.3/src/zope/formlib/configure.zcml
  U   Zope3/branches/3.3/src/zope/formlib/form.py
  D   Zope3/branches/3.3/src/zope/formlib/i18n.py
  D   Zope3/branches/3.3/src/zope/formlib/locales/

-=-
Modified: Zope3/branches/3.3/src/zope/formlib/configure.zcml
===================================================================
--- Zope3/branches/3.3/src/zope/formlib/configure.zcml	2006-05-13 03:38:11 UTC (rev 68115)
+++ Zope3/branches/3.3/src/zope/formlib/configure.zcml	2006-05-13 07:18:25 UTC (rev 68116)
@@ -2,9 +2,8 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:zc="http://namespaces.zope.com/zc"
     xmlns:i18n="http://namespaces.zope.org/i18n"
-    i18n_domain="zope.formlib">
+    i18n_domain="zope">
 
-  <i18n:registerTranslations directory="locales" />
 
   <adapter factory=".form.default_page_template" name="default" />
   <adapter factory=".form.default_subpage_template" name="default" />

Modified: Zope3/branches/3.3/src/zope/formlib/form.py
===================================================================
--- Zope3/branches/3.3/src/zope/formlib/form.py	2006-05-13 03:38:11 UTC (rev 68115)
+++ Zope3/branches/3.3/src/zope/formlib/form.py	2006-05-13 07:18:25 UTC (rev 68116)
@@ -42,8 +42,10 @@
 from zope.app.pagetemplate import ViewPageTemplateFile
 
 from zope.formlib import interfaces, namedtemplate
-from zope.formlib.i18n import _
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("zope")
 
+
 interface.moduleProvides(interfaces.IFormAPI)
 
 _identifier = re.compile('[A-Za-z][a-zA-Z0-9_]*$')

Deleted: Zope3/branches/3.3/src/zope/formlib/i18n.py
===================================================================
--- Zope3/branches/3.3/src/zope/formlib/i18n.py	2006-05-13 03:38:11 UTC (rev 68115)
+++ Zope3/branches/3.3/src/zope/formlib/i18n.py	2006-05-13 07:18:25 UTC (rev 68116)
@@ -1,20 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2005 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.
-#
-##############################################################################
-"""Domain definition
-
-$Id$
-"""
-
-import zope.i18nmessageid
-
-_ = zope.i18nmessageid.MessageFactory('zope.formlib')