[Zope3-checkins] SVN: Zope3/trunk/src/ Put the second part of the
roadmap described in zope.i18nmessages/messages.txt
Philipp von Weitershausen
philikon at philikon.de
Tue Oct 11 14:40:12 EDT 2005
Log message for revision 39064:
Put the second part of the roadmap described in zope.i18nmessages/messages.txt
into practice by moving to immutable Messages everywhere in Zope.
Changed:
U Zope3/trunk/src/buddydemo/interfaces.py
U Zope3/trunk/src/zope/app/apidoc/bookmodule/book.py
U Zope3/trunk/src/zope/app/apidoc/codemodule/browser/README.txt
U Zope3/trunk/src/zope/app/apidoc/codemodule/browser/module.py
U Zope3/trunk/src/zope/app/apidoc/codemodule/codemodule.py
U Zope3/trunk/src/zope/app/apidoc/codemodule/interfaces.py
U Zope3/trunk/src/zope/app/apidoc/component.py
U Zope3/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py
U Zope3/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py
U Zope3/trunk/src/zope/app/apidoc/typemodule/type.py
U Zope3/trunk/src/zope/app/apidoc/utilities.py
U Zope3/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py
U Zope3/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py
U Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_translationdomaincontrol.py
U Zope3/trunk/src/zope/app/applicationcontrol/browser/runtimeinfo.py
U Zope3/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py
U Zope3/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py
U Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py
U Zope3/trunk/src/zope/app/applicationcontrol/runtimeinfo.py
U Zope3/trunk/src/zope/app/authentication/browser/schemasearch.py
U Zope3/trunk/src/zope/app/authentication/groupfolder.py
U Zope3/trunk/src/zope/app/authentication/interfaces.py
U Zope3/trunk/src/zope/app/authentication/principalfolder.py
U Zope3/trunk/src/zope/app/cache/browser/cacheable.py
U Zope3/trunk/src/zope/app/catalog/interfaces.py
U Zope3/trunk/src/zope/app/catalog/text.py
U Zope3/trunk/src/zope/app/component/browser/__init__.py
U Zope3/trunk/src/zope/app/component/browser/registration.py
U Zope3/trunk/src/zope/app/component/browser/site.py
U Zope3/trunk/src/zope/app/component/browser/tools.py
U Zope3/trunk/src/zope/app/component/interfaces/__init__.py
U Zope3/trunk/src/zope/app/component/interfaces/registration.py
U Zope3/trunk/src/zope/app/component/metadirectives.py
U Zope3/trunk/src/zope/app/component/registration.py
U Zope3/trunk/src/zope/app/component/vocabulary.py
U Zope3/trunk/src/zope/app/container/browser/adding.py
U Zope3/trunk/src/zope/app/container/browser/contents.py
U Zope3/trunk/src/zope/app/container/browser/metaconfigure.py
U Zope3/trunk/src/zope/app/container/constraints.py
U Zope3/trunk/src/zope/app/container/contained.py
U Zope3/trunk/src/zope/app/container/dependency.py
U Zope3/trunk/src/zope/app/container/size.py
U Zope3/trunk/src/zope/app/dav/tests/test_adapter.py
U Zope3/trunk/src/zope/app/demo/passwdauth/interfaces.py
U Zope3/trunk/src/zope/app/demo/widget/interfaces/boolwidget.py
U Zope3/trunk/src/zope/app/demo/widget/interfaces/intwidget.py
U Zope3/trunk/src/zope/app/demo/widget/interfaces/textareawidget.py
U Zope3/trunk/src/zope/app/demo/widget/interfaces/textwidget.py
U Zope3/trunk/src/zope/app/dtmlpage/interfaces.py
U Zope3/trunk/src/zope/app/dublincore/browser/metadataedit.py
U Zope3/trunk/src/zope/app/file/browser/file.py
U Zope3/trunk/src/zope/app/file/image.py
U Zope3/trunk/src/zope/app/file/interfaces.py
U Zope3/trunk/src/zope/app/form/browser/add.py
U Zope3/trunk/src/zope/app/form/browser/boolwidgets.py
U Zope3/trunk/src/zope/app/form/browser/editview.py
U Zope3/trunk/src/zope/app/form/browser/editwizard.py
U Zope3/trunk/src/zope/app/form/browser/formview.py
U Zope3/trunk/src/zope/app/form/browser/itemswidgets.py
U Zope3/trunk/src/zope/app/form/browser/metaconfigure.py
U Zope3/trunk/src/zope/app/form/browser/sequencewidget.py
U Zope3/trunk/src/zope/app/form/browser/source.py
U Zope3/trunk/src/zope/app/form/browser/textwidgets.py
U Zope3/trunk/src/zope/app/fssync/browser/__init__.py
U Zope3/trunk/src/zope/app/generations/browser/managers.py
U Zope3/trunk/src/zope/app/homefolder/interfaces.py
U Zope3/trunk/src/zope/app/i18n/browser/synchronize.py
U Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.py
U Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.py
U Zope3/trunk/src/zope/app/keyreference/interfaces.py
U Zope3/trunk/src/zope/app/locales/extract.py
U Zope3/trunk/src/zope/app/locking/interfaces.py
U Zope3/trunk/src/zope/app/locking/storage.py
U Zope3/trunk/src/zope/app/mail/interfaces.py
U Zope3/trunk/src/zope/app/onlinehelp/interfaces.py
U Zope3/trunk/src/zope/app/pagetemplate/engine.py
U Zope3/trunk/src/zope/app/pluggableauth/interfaces.py
U Zope3/trunk/src/zope/app/preference/browser.py
U Zope3/trunk/src/zope/app/presentation/interfaces.py
U Zope3/trunk/src/zope/app/publisher/interfaces/browser.py
U Zope3/trunk/src/zope/app/pythonpage/__init__.py
U Zope3/trunk/src/zope/app/pythonpage/browser.py
U Zope3/trunk/src/zope/app/rdb/interfaces.py
U Zope3/trunk/src/zope/app/recorder/browser.py
U Zope3/trunk/src/zope/app/registration/__init__.py
U Zope3/trunk/src/zope/app/rotterdam/xmlobject.py
U Zope3/trunk/src/zope/app/schema/browser/__init__.py
U Zope3/trunk/src/zope/app/schemacontent/interfaces.py
U Zope3/trunk/src/zope/app/security/browser/auth.py
U Zope3/trunk/src/zope/app/security/permission.py
U Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py
U Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py
U Zope3/trunk/src/zope/app/securitypolicy/browser/tests/test_rolepermissionview.py
U Zope3/trunk/src/zope/app/securitypolicy/role.py
U Zope3/trunk/src/zope/app/session/http.py
U Zope3/trunk/src/zope/app/session/interfaces.py
U Zope3/trunk/src/zope/app/size/__init__.py
U Zope3/trunk/src/zope/app/sqlscript/interfaces.py
U Zope3/trunk/src/zope/app/traversing/browser/absoluteurl.py
U Zope3/trunk/src/zope/app/versioncontrol/interfaces.py
U Zope3/trunk/src/zope/app/viewlet/interfaces.py
U Zope3/trunk/src/zope/app/workflow/interfaces/__init__.py
U Zope3/trunk/src/zope/app/workflow/stateful/browser/contentworkflow.py
U Zope3/trunk/src/zope/app/workflow/stateful/browser/instance.py
U Zope3/trunk/src/zope/app/workflow/stateful/interfaces.py
U Zope3/trunk/src/zope/app/zptpage/interfaces.py
U Zope3/trunk/src/zope/app/zptpage/zptpage.py
U Zope3/trunk/src/zope/configuration/fields.py
U Zope3/trunk/src/zope/schema/_bootstrapinterfaces.py
U Zope3/trunk/src/zope/schema/interfaces.py
U Zope3/trunk/src/zope/schema/tests/test_objectfield.py
U Zope3/trunk/src/zope/tal/talgettext.py
U Zope3/trunk/src/zwiki/__init__.py
U Zope3/trunk/src/zwiki/interfaces.py
-=-
Modified: Zope3/trunk/src/buddydemo/interfaces.py
===================================================================
--- Zope3/trunk/src/buddydemo/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/buddydemo/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -2,8 +2,8 @@
import zope.interface
from zope.schema import Text, TextLine
-from zope.i18nmessageid import MessageIDFactory
-_ = MessageIDFactory("buddydemo")
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("buddydemo")
class IBuddy(zope.interface.Interface):
"""Provides access to basic buddy information"""
Modified: Zope3/trunk/src/zope/app/apidoc/bookmodule/book.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/bookmodule/book.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/bookmodule/book.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -27,7 +27,7 @@
from zope.app import zapi
from zope.interface import implements
from zope.app.apidoc.interfaces import IDocumentationModule
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.onlinehelp.onlinehelp import OnlineHelp
Modified: Zope3/trunk/src/zope/app/apidoc/codemodule/browser/README.txt
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/codemodule/browser/README.txt 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/codemodule/browser/README.txt 2005-10-11 18:40:10 UTC (rev 39064)
@@ -153,8 +153,8 @@
{'interface': 'zope.app.apidoc.interfaces.IDocumentationModule',
'name': 'title',
'read_perm': None,
- 'type': 'MessageID',
- 'type_link': 'zope/i18nmessageid/messageid/MessageID',
+ 'type': 'Message',
+ 'type_link': 'zope/i18nmessageid/message/Message',
'value': "u'Code Browser'",
'write_perm': None}
Modified: Zope3/trunk/src/zope/app/apidoc/codemodule/browser/module.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/codemodule/browser/module.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/codemodule/browser/module.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
from zope.proxy import removeAllProxies
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.apidoc.utilities import renderText, columnize
from zope.app.apidoc.codemodule.module import Module
Modified: Zope3/trunk/src/zope/app/apidoc/codemodule/codemodule.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/codemodule/codemodule.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/codemodule/codemodule.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
__docformat__ = 'restructuredtext'
from zope.interface import Interface, implements
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
Modified: Zope3/trunk/src/zope/app/apidoc/codemodule/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/codemodule/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/codemodule/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
from zope.app.container.interfaces import IContainer
from zope.app.container.interfaces import IReadContainer
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IAPIDocRootModule(zope.interface.Interface):
Modified: Zope3/trunk/src/zope/app/apidoc/component.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/component.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/component.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -25,7 +25,7 @@
from zope.publisher.interfaces import IRequest
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.apidoc.utilities import relativizePath, truncateSysPath
from zope.app.apidoc.utilities import getPythonPath, renderText
from zope.app.apidoc.classregistry import classRegistry
Modified: Zope3/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/ifacemodule/ifacemodule.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -29,7 +29,7 @@
from zope.app.location import LocationProxy
from zope.app.component.interface \
import queryInterface, searchInterfaceUtilities
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IInterfaceModule(IDocumentationModule):
"""Interface API Documentation Module
Modified: Zope3/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/ifacemodule/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
import zope.interface
import zope.schema
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IInterfaceDetailsPreferences(zope.interface.Interface):
Modified: Zope3/trunk/src/zope/app/apidoc/typemodule/type.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/typemodule/type.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/typemodule/type.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,7 +20,7 @@
from zope.interface.interfaces import IInterface
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.location import LocationProxy
from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
Modified: Zope3/trunk/src/zope/app/apidoc/utilities.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/utilities.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/utilities.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -31,7 +31,7 @@
from zope.security.proxy import removeSecurityProxy
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.container.interfaces import IReadContainer
_remove_html_overhead = re.compile(
Modified: Zope3/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/utilitymodule/utilitymodule.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
from zope.interface import implements
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.component import queryNextSiteManager
from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
Modified: Zope3/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/apidoc/zcmlmodule/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -26,7 +26,7 @@
from zope.interface import implements
import zope.app.appsetup.appsetup
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.location.interfaces import ILocation
from zope.app.apidoc.interfaces import IDocumentationModule
from zope.app.apidoc.utilities import ReadContainerBase
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_translationdomaincontrol.py
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_translationdomaincontrol.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/ftests/test_translationdomaincontrol.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
import unittest
from zope.app.testing.functional import BrowserTestCase
-class ZODBControlTest(BrowserTestCase):
+class MessageCatalogControlTest(BrowserTestCase):
def testDomainOverview(self):
response = self.publish(
@@ -43,7 +43,7 @@
def test_suite():
suite = unittest.TestSuite()
- suite.addTest(unittest.makeSuite(ZODBControlTest))
+ suite.addTest(unittest.makeSuite(MessageCatalogControlTest))
return suite
if __name__=='__main__':
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/runtimeinfo.py
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/runtimeinfo.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/runtimeinfo.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from zope.app.applicationcontrol.interfaces import IRuntimeInfo
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class RuntimeInfoView(object):
@@ -64,9 +64,8 @@
hours, minutes = divmod(minutes, 60)
days, hours = divmod(hours, 24)
- uptime = _('${days} day(s) ${hours}:${minutes}:${seconds}')
- uptime.mapping = {'days': '%d' % days,
- 'hours': '%02d' % hours,
- 'minutes': '%02d' % minutes,
- 'seconds': '%02d' % seconds}
- return uptime
+ return _('${days} day(s) ${hours}:${minutes}:${seconds}',
+ mapping = {'days': '%d' % days,
+ 'hours': '%02d' % hours,
+ 'minutes': '%02d' % minutes,
+ 'seconds': '%02d' % seconds})
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/servercontrol.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,7 +20,7 @@
from zope.app import zapi
from zope.app.applicationcontrol.interfaces import IServerControl
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class ServerControlView(object):
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/translationdomaincontrol.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from zope.i18n.interfaces import ITranslationDomain
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class TranslationDomainControlView(object):
@@ -50,8 +50,8 @@
domain.reloadCatalogs(fileNames)
status = _('Message Catalog for ${language} language'
- ' in ${domain} domain successfully reloaded.')
- status.mapping['language'] = language
- status.mapping['domain'] = domain.domain
+ ' in ${domain} domain successfully reloaded.',
+ mapping = {u'language': language,
+ u'domain': domain.domain})
return status
Modified: Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/applicationcontrol/browser/zodbcontrol.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
__docformat__ = 'restructuredtext'
from ZODB.FileStorage.FileStorage import FileStorageError
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.size import byteDisplay
Modified: Zope3/trunk/src/zope/app/applicationcontrol/runtimeinfo.py
===================================================================
--- Zope3/trunk/src/zope/app/applicationcontrol/runtimeinfo.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/applicationcontrol/runtimeinfo.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -31,7 +31,7 @@
from zope.component import getUtility, ComponentLookupError
from zope.interface import implements
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.applicationcontrol.interfaces import IRuntimeInfo
from zope.app.applicationcontrol.interfaces import IApplicationControl
Modified: Zope3/trunk/src/zope/app/authentication/browser/schemasearch.py
===================================================================
--- Zope3/trunk/src/zope/app/authentication/browser/schemasearch.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/authentication/browser/schemasearch.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
from zope.app.form.utility import setUpWidgets, getWidgetsData
from zope.app.form.interfaces import IInputWidget
from zope.app.form.browser.interfaces import ISourceQueryView
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
search_label = _('search-button', 'Search')
Modified: Zope3/trunk/src/zope/app/authentication/groupfolder.py
===================================================================
--- Zope3/trunk/src/zope/app/authentication/groupfolder.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/authentication/groupfolder.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -33,7 +33,7 @@
from zope.app.container.btree import BTreeContainer
import zope.app.container.constraints
import zope.app.container.interfaces
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
import zope.app.security.vocabulary
from zope.app.security.interfaces import IAuthenticatedGroup, IEveryoneGroup
from zope.app.authentication import principalfolder, interfaces
Modified: Zope3/trunk/src/zope/app/authentication/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/authentication/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/authentication/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
import zope.interface
import zope.schema
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.security.interfaces import ILogout
from zope.app.container.constraints import contains, containers
from zope.app.container.interfaces import IContainer
Modified: Zope3/trunk/src/zope/app/authentication/principalfolder.py
===================================================================
--- Zope3/trunk/src/zope/app/authentication/principalfolder.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/authentication/principalfolder.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -29,7 +29,7 @@
from zope.app.container.contained import Contained
from zope.app.container.constraints import contains, containers
from zope.app.container.btree import BTreeContainer
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.authentication import interfaces
Modified: Zope3/trunk/src/zope/app/cache/browser/cacheable.py
===================================================================
--- Zope3/trunk/src/zope/app/cache/browser/cacheable.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/cache/browser/cacheable.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,7 +20,7 @@
from zope.app import zapi
from zope.app.cache.caching import getCacheForObject, getLocationForCache
from zope.app.form.utility import setUpEditWidgets
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.annotation.interfaces import IAnnotatable
from zope.app.cache.interfaces import ICacheable
from zope.app.form.interfaces import WidgetInputError
Modified: Zope3/trunk/src/zope/app/catalog/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/catalog/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/catalog/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
import zope.app.container.interfaces
import zope.app.container.constraints
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class ICatalogQuery(zope.interface.Interface):
"""Provides Catalog Queries."""
Modified: Zope3/trunk/src/zope/app/catalog/text.py
===================================================================
--- Zope3/trunk/src/zope/app/catalog/text.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/catalog/text.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
import zope.app.catalog.attribute
import zope.app.catalog.interfaces
import zope.app.container.contained
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class ITextIndex(zope.app.catalog.interfaces.IAttributeIndex,
zope.app.catalog.interfaces.ICatalogIndex):
Modified: Zope3/trunk/src/zope/app/component/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/browser/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from zope.security.proxy import removeSecurityProxy
from zope.app import zapi
from zope.app.container.browser.adding import Adding
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.container.interfaces import INameChooser
from zope.app.component.interfaces.registration import ActiveStatus
from zope.app.component.interfaces.registration import InactiveStatus
Modified: Zope3/trunk/src/zope/app/component/browser/registration.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/registration.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/browser/registration.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -23,7 +23,7 @@
from zope.app.container.browser.adding import Adding
from zope.app.container.interfaces import INameChooser
from zope.app.form.browser.widget import SimpleInputWidget
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.publisher.browser import BrowserView
from zope.app.component import interfaces
from zope.app.component.interfaces.registration import ActiveStatus
Modified: Zope3/trunk/src/zope/app/component/browser/site.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/site.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/browser/site.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
__docformat__ = "reStructuredText"
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class UtilityRegistrationDetails(object):
Modified: Zope3/trunk/src/zope/app/component/browser/tools.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/tools.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/browser/tools.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
from zope.app.component import site, interfaces, browser
from zope.app.event import objectevent
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IToolType(zope.interface.interfaces.IInterface):
Modified: Zope3/trunk/src/zope/app/component/interfaces/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/component/interfaces/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/interfaces/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
from zope.app.container.interfaces import IContainer
from zope.app.container.constraints import ContainerTypesConstraint
from zope.app.container.constraints import ItemTypePrecondition
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
import registration
class ILocalAdapterRegistry(registration.IRegistry,
Modified: Zope3/trunk/src/zope/app/component/interfaces/registration.py
===================================================================
--- Zope3/trunk/src/zope/app/component/interfaces/registration.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/interfaces/registration.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -25,7 +25,7 @@
from zope.app.container.interfaces import IContained, IContainer
from zope.app.container.constraints import contains, containers
from zope.app.event.interfaces import IObjectEvent
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.component import bbb
Modified: Zope3/trunk/src/zope/app/component/metadirectives.py
===================================================================
--- Zope3/trunk/src/zope/app/component/metadirectives.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/metadirectives.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
import zope.app.security.fields
import zope.app.component.fields
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IDefaultViewName(zope.interface.Interface):
"""A string that contains the default view name
Modified: Zope3/trunk/src/zope/app/component/registration.py
===================================================================
--- Zope3/trunk/src/zope/app/component/registration.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/registration.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -31,7 +31,7 @@
from zope.app.event import objectevent
from zope.app.location import inside
from zope.app.traversing.interfaces import TraversalError
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
# BBB: First introduced in 3.1; should go away in 3.3
import bbb
@@ -147,8 +147,8 @@
objectpath = zapi.getPath(registration)
except: # TODO decide if this is really the best fall-back plan
objectpath = str(registration)
- msg = _("Can't delete active registration (${path})")
- msg.mapping["path"] = objectpath
+ msg = _("Can't delete active registration (${path})",
+ mapping={u'path': objectpath})
raise DependencyError(msg)
Modified: Zope3/trunk/src/zope/app/component/vocabulary.py
===================================================================
--- Zope3/trunk/src/zope/app/component/vocabulary.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/component/vocabulary.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
from zope.schema.interfaces import ITokenizedTerm
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.interface.vocabulary import ObjectInterfacesVocabulary
from interfaces import IUtilityRegistration
Modified: Zope3/trunk/src/zope/app/container/browser/adding.py
===================================================================
--- Zope3/trunk/src/zope/app/container/browser/adding.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/container/browser/adding.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -35,7 +35,7 @@
from zope.app import zapi
from zope.app.event.objectevent import ObjectCreatedEvent
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.location import LocationProxy
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.publisher.browser import BrowserView
Modified: Zope3/trunk/src/zope/app/container/browser/contents.py
===================================================================
--- Zope3/trunk/src/zope/app/container/browser/contents.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/container/browser/contents.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -28,7 +28,7 @@
from zope.app.size.interfaces import ISized
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.publisher.browser import BrowserView
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.dublincore.interfaces import IDCDescriptiveProperties
from zope.app.copypastemove.interfaces import IPrincipalClipboard
@@ -280,12 +280,13 @@
m = {"name": id}
title = getDCTitle(ob)
if title:
+ m["title"] = title
self.error = _(
- "Object '${name}' (${title}) cannot be copied")
- m["title"] = title
+ "Object '${name}' (${title}) cannot be copied",
+ mapping=m)
else:
- self.error = _("Object '${name}' cannot be copied")
- self.error.mapping.update(m)
+ self.error = _("Object '${name}' cannot be copied",
+ mapping=m)
return
items.append(zapi.joinPath(container_path, id))
@@ -316,12 +317,13 @@
m = {"name": id}
title = getDCTitle(ob)
if title:
+ m["title"] = title
self.error = _(
- "Object '${name}' (${title}) cannot be moved")
- m["title"] = title
+ "Object '${name}' (${title}) cannot be moved",
+ mapping=m)
else:
- self.error = _("Object '${name}' cannot be moved")
- self.error.mapping.update(m)
+ self.error = _("Object '${name}' cannot be moved",
+ mapping=m)
return
items.append(zapi.joinPath(container_path, id))
Modified: Zope3/trunk/src/zope/app/container/browser/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/container/browser/metaconfigure.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/container/browser/metaconfigure.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -26,7 +26,7 @@
from zope.app.publisher.browser.viewmeta import page, view
from zope.app.container.browser.contents import Contents
from zope.app.container.browser.adding import Adding
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.security.fields import Permission
Modified: Zope3/trunk/src/zope/app/container/constraints.py
===================================================================
--- Zope3/trunk/src/zope/app/container/constraints.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/container/constraints.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -159,7 +159,7 @@
from zope.interface import providedBy
from zope.app.container.interfaces import InvalidItemType, InvalidContainerType
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.container.interfaces import IContainer
def checkObject(container, name, object):
Modified: Zope3/trunk/src/zope/app/container/contained.py
===================================================================
--- Zope3/trunk/src/zope/app/container/contained.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/container/contained.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -29,7 +29,7 @@
from zope.app.exception.interfaces import UserError
from zope.app.event.objectevent import ObjectEvent, modified
from zope.event import notify
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.container.interfaces import IContained
from zope.app.container.interfaces import INameChooser
from zope.app.container.interfaces import IObjectAddedEvent
Modified: Zope3/trunk/src/zope/app/container/dependency.py
===================================================================
--- Zope3/trunk/src/zope/app/container/dependency.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/container/dependency.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,8 @@
__docformat__ = 'restructuredtext'
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.i18nmessageid import Message
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.dependable.interfaces import IDependable, DependencyError
exception_msg = _("""
@@ -41,5 +42,4 @@
"object": zapi.getPath(object),
"dependents": ", ".join(dependents)
}
- exception_msg.mapping = mapping
- raise DependencyError(exception_msg)
+ raise DependencyError(Message(exception_msg, mapping=mapping))
Modified: Zope3/trunk/src/zope/app/container/size.py
===================================================================
--- Zope3/trunk/src/zope/app/container/size.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/container/size.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.size.interfaces import ISized
from zope.interface import implements
@@ -38,6 +38,4 @@
num_items = len(self._container)
if num_items == 1:
return _('1 item')
- size = _('${items} items')
- size.mapping = {'items': str(num_items)}
- return size
+ return _('${items} items', mapping={'items': str(num_items)})
Modified: Zope3/trunk/src/zope/app/dav/tests/test_adapter.py
===================================================================
--- Zope3/trunk/src/zope/app/dav/tests/test_adapter.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/dav/tests/test_adapter.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
from zope.app.testing.placelesssetup import setUp, tearDown
from zope.app.size.interfaces import ISized
from zope.app.filerepresentation.interfaces import IReadDirectory
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
import zope.app.location
from zope.app.dublincore.interfaces import IWriteZopeDublinCore
@@ -53,9 +53,7 @@
return None, None
def sizeForDisplay(self):
- msg = _(u"${num} robot unit")
- msg.mapping = {'num': 1}
- return msg
+ return _(u"${num} robot unit", mapping={'num': 1})
class RobotDirectory(object):
implements(IReadDirectory)
Modified: Zope3/trunk/src/zope/app/demo/passwdauth/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/demo/passwdauth/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/demo/passwdauth/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
__docformat__ = 'restructuredtext'
from zope.schema import TextLine
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.pluggableauth.interfaces import IPrincipalSource
Modified: Zope3/trunk/src/zope/app/demo/widget/interfaces/boolwidget.py
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/interfaces/boolwidget.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/demo/widget/interfaces/boolwidget.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,7 +20,7 @@
from zope.interface import Interface
from zope.schema import Bool
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.demo.widget.interfaces import IDemoWidget
Modified: Zope3/trunk/src/zope/app/demo/widget/interfaces/intwidget.py
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/interfaces/intwidget.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/demo/widget/interfaces/intwidget.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,7 +20,7 @@
from zope.interface import Interface
from zope.schema import Int
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.demo.widget.interfaces import IDemoWidget
Modified: Zope3/trunk/src/zope/app/demo/widget/interfaces/textareawidget.py
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/interfaces/textareawidget.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/demo/widget/interfaces/textareawidget.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,7 +20,7 @@
from zope.interface import Interface
from zope.schema import Text
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.demo.widget.interfaces import IDemoWidget
Modified: Zope3/trunk/src/zope/app/demo/widget/interfaces/textwidget.py
===================================================================
--- Zope3/trunk/src/zope/app/demo/widget/interfaces/textwidget.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/demo/widget/interfaces/textwidget.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,7 +20,7 @@
from zope.interface import Interface
from zope.schema import TextLine
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.demo.widget.interfaces import IDemoWidget
Modified: Zope3/trunk/src/zope/app/dtmlpage/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/dtmlpage/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/dtmlpage/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
import zope.schema
from zope.interface import Interface, Attribute
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IDTMLPage(Interface):
"""DTML Pages are a persistent implementation of DTML."""
Modified: Zope3/trunk/src/zope/app/dublincore/browser/metadataedit.py
===================================================================
--- Zope3/trunk/src/zope/app/dublincore/browser/metadataedit.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/dublincore/browser/metadataedit.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
from zope.event import notify
from zope.app.event.objectevent import ObjectModifiedEvent
from zope.app.event.objectevent import Attributes
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.dublincore.interfaces import IZopeDublinCore
@@ -39,8 +39,8 @@
dc.description = unicode(request['dcdescription'])
description = Attributes(IZopeDublinCore, 'title', 'description')
notify(ObjectModifiedEvent(self.context, description))
- message = _("Changed data ${datetime}")
- message.mapping = {'datetime': formatter.format(datetime.utcnow())}
+ message = _("Changed data ${datetime}",
+ mapping={'datetime': formatter.format(datetime.utcnow())})
return {
'message': message,
Modified: Zope3/trunk/src/zope/app/file/browser/file.py
===================================================================
--- Zope3/trunk/src/zope/app/file/browser/file.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/file/browser/file.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -26,7 +26,7 @@
from zope.app.event import objectevent
from zope.app.file.file import File
from zope.app.file.interfaces import IFile
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.exception.interfaces import UserError
__docformat__ = 'restructuredtext'
@@ -218,9 +218,8 @@
formatter = self.request.locale.dates.getFormatter(
'dateTime', 'medium')
- status = _("Updated on ${date_time}")
- status.mapping = {'date_time': formatter.format(datetime.utcnow())}
- return status
+ return _("Updated on ${date_time}",
+ mapping={'date_time': formatter.format(datetime.utcnow())})
class IFileEditForm(IFile):
@@ -342,13 +341,13 @@
'data': self.context.data.decode(charset)}
except LookupError:
msg = _("The character set specified in the content type"
- " ($charset) is not supported.")
- msg.mapping = {'charset': charset}
+ " ($charset) is not supported.",
+ mapping={'charset': charset})
raise UserError(msg)
except UnicodeDecodeError:
msg = _("The character set specified in the content type"
- " ($charset) does not match file content.")
- msg.mapping = {'charset': charset}
+ " ($charset) does not match file content.",
+ mapping={'charset': charset})
raise UserError(msg)
def setData(self, data):
@@ -362,22 +361,21 @@
self.context.contentType = data['contentType']
formatter = self.request.locale.dates.getFormatter('dateTime',
'medium')
- status = _("Updated on ${date_time}")
- status.mapping = {'date_time': formatter.format(datetime.utcnow())}
- return status
+ return _("Updated on ${date_time}",
+ mapping={'date_time': formatter.format(datetime.utcnow())})
def update(self):
try:
return super(FileEdit, self).update()
except CharsetTooWeak, charset:
self.update_status = _("The character set you specified ($charset)"
- " cannot encode all characters in text.")
- self.update_status.mapping = {'charset': charset}
+ " cannot encode all characters in text.",
+ mapping={'charset': charset})
return self.update_status
except UnknownCharset, charset:
self.update_status = _("The character set you specified ($charset)"
- " is not supported.")
- self.update_status.mapping = {'charset': charset}
+ " is not supported.",
+ mapping={'charset': charset})
return self.update_status
Modified: Zope3/trunk/src/zope/app/file/image.py
===================================================================
--- Zope3/trunk/src/zope/app/file/image.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/file/image.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -25,7 +25,7 @@
from zope.app.size.interfaces import ISized
from zope.app.size import byteDisplay
from zope.app.content_types import guess_content_type
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from file import File
from interfaces import IImage
@@ -71,10 +71,12 @@
bytes = self._image.getSize()
byte_size = byteDisplay(bytes)
mapping = byte_size.mapping
- size = _(byte_size + ' ${width}x${height}')
+ if mapping is None:
+ mapping = {}
mapping.update({'width': str(w), 'height': str(h)})
- size.mapping = mapping
- return size
+ #TODO the way this message id is defined, it won't be picked up by
+ # i18nextract and never show up in message catalogs
+ return _(byte_size + ' ${width}x${height}', mapping=mapping)
class FileFactory(object):
Modified: Zope3/trunk/src/zope/app/file/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/file/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/file/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from zope.schema import BytesLine, Bytes
from zope.interface import Interface
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
# BBB: To go away in 3.3
Modified: Zope3/trunk/src/zope/app/form/browser/add.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/add.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/add.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -28,7 +28,7 @@
from zope.app.event.objectevent import ObjectModifiedEvent
from zope.app.event.objectevent import Attributes
from zope.app.form.utility import setUpWidgets, getWidgetsData
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.form.interfaces import IInputWidget, WidgetsError
from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
Modified: Zope3/trunk/src/zope/app/form/browser/boolwidgets.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/boolwidgets.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/boolwidgets.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -25,7 +25,7 @@
from zope.app.form.browser.itemswidgets import RadioWidget
from zope.app.form.browser.itemswidgets import SelectWidget, DropdownWidget
from zope.app.form.interfaces import IInputWidget
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class CheckBoxWidget(SimpleInputWidget):
"""A checkbox widget used to display Bool fields.
Modified: Zope3/trunk/src/zope/app/form/browser/editview.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/editview.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/editview.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -29,7 +29,7 @@
from zope.event import notify
from zope.app.event.objectevent import ObjectModifiedEvent
from zope.app.event.objectevent import Attributes
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.form.interfaces import WidgetsError
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
@@ -113,9 +113,9 @@
self.changed()
formatter = self.request.locale.dates.getFormatter(
'dateTime', 'medium')
- status = _("Updated on ${date_time}")
- status.mapping = {'date_time': formatter.format(
- datetime.utcnow())}
+ status = _("Updated on ${date_time}",
+ mapping={'date_time':
+ formatter.format(datetime.utcnow())})
self.update_status = status
return status
Modified: Zope3/trunk/src/zope/app/form/browser/editwizard.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/editwizard.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/editwizard.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
from zope.event import notify
from zope.app.event.objectevent import ObjectModifiedEvent
from zope.app.event.objectevent import Attributes
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.pagetemplate.simpleviewclass import SimpleViewClass
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
Modified: Zope3/trunk/src/zope/app/form/browser/formview.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/formview.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/formview.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
from zope.app.form.utility import setUpWidgets, applyWidgetsChanges
from zope.app.form.browser.editview import EditView
from zope.app.form.browser.submit import Update
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class Data(dict):
Modified: Zope3/trunk/src/zope/app/form/browser/itemswidgets.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/itemswidgets.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/itemswidgets.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -30,7 +30,7 @@
from zope.app.form.interfaces import ConversionError
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
# For choices, we want to make the widget a view of the field and vocabulary.
@@ -72,12 +72,6 @@
def translate(self, msgid):
return translate(msgid, context=self.request, default=msgid)
-def message(msgid, default):
- """Add a default value to a i18n message id."""
- msgid.default = default
- return msgid
-
-
class ItemsWidgetBase(TranslationHook, SimpleInputWidget):
"""Convenience base class for widgets displaying items/choices."""
@@ -222,7 +216,7 @@
ItemsWidgetBase.__init__(self, *args, **kw)
self.required = False
- _messageNoValue = message(_("item-missing-single-value-for-display"), "")
+ _messageNoValue = _("item-missing-single-value-for-display", "")
def __call__(self):
"""See IBrowserWidget."""
@@ -241,8 +235,7 @@
ItemsWidgetBase.__init__(self, *args, **kw)
self.required = False
- _messageNoValue = message(
- _("vocabulary-missing-multiple-value-for-display"), "")
+ _messageNoValue = _("vocabulary-missing-multiple-value-for-display", "")
itemTag = 'li'
tag = 'ol'
@@ -391,8 +384,8 @@
class SelectWidget(ItemsEditWidgetBase):
"""Provide a selection list for the item."""
- _messageNoValue = message(_("vocabulary-missing-single-value-for-edit"),
- "(no value)")
+ _messageNoValue = _("vocabulary-missing-single-value-for-edit",
+ "(no value)")
def renderValue(self, value):
rendered_items = self.renderItems(value)
@@ -436,8 +429,8 @@
"""
orientation = "vertical"
- _messageNoValue = message(_("vocabulary-missing-single-value-for-edit"),
- "(no value)")
+ _messageNoValue = _("vocabulary-missing-single-value-for-edit",
+ "(no value)")
_joinButtonToMessageTemplate = u"<label>%s %s</label>"
@@ -509,8 +502,8 @@
class ItemsMultiEditWidgetBase(MultiDataHelper, ItemsEditWidgetBase):
"""Items widget supporting multiple selections."""
- _messageNoValue = message(
- _("vocabulary-missing-multiple-value-for-edit"), "(no values)")
+ _messageNoValue = _("vocabulary-missing-multiple-value-for-edit",
+ "(no values)")
def renderItems(self, value):
if value == self.context.missing_value:
Modified: Zope3/trunk/src/zope/app/form/browser/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/metaconfigure.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/metaconfigure.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -29,7 +29,7 @@
from zope.publisher.interfaces.browser import IBrowserRequest
from zope.publisher.interfaces.browser import IDefaultBrowserLayer
from zope.app.publisher.browser.menumeta import menuItemDirective
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.form import CustomWidgetFactory
from zope.app.form.interfaces import IInputWidget, IDisplayWidget
Modified: Zope3/trunk/src/zope/app/form/browser/sequencewidget.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/sequencewidget.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/sequencewidget.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -26,7 +26,7 @@
from zope.app.form import InputWidget
from zope.app.form.browser.widget import BrowserWidget
from zope.app.form.browser.widget import DisplayWidget, renderElement
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class SequenceWidget(BrowserWidget, InputWidget):
"""A widget baseclass for a sequence of fields.
Modified: Zope3/trunk/src/zope/app/form/browser/source.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/source.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/source.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -23,7 +23,7 @@
import zope.app.form.interfaces
import zope.app.form.browser.widget
import zope.app.form.browser.interfaces
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.form.interfaces import WidgetInputError, MissingInputError
from zope.app.form.browser.interfaces import IWidgetInputErrorView
Modified: Zope3/trunk/src/zope/app/form/browser/textwidgets.py
===================================================================
--- Zope3/trunk/src/zope/app/form/browser/textwidgets.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/form/browser/textwidgets.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -27,7 +27,7 @@
from zope.app.datetimeutils import parseDatetimetz
from zope.app.datetimeutils import DateTimeError
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
def escape(str):
Modified: Zope3/trunk/src/zope/app/fssync/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/fssync/browser/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/fssync/browser/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -31,7 +31,7 @@
from zope.app.fssync.committer import Committer, Checker
from zope.fssync.metadata import Metadata
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
def snarf_dir(response, dirname):
"""Helper to snarf a directory to the response."""
Modified: Zope3/trunk/src/zope/app/generations/browser/managers.py
===================================================================
--- Zope3/trunk/src/zope/app/generations/browser/managers.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/generations/browser/managers.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
from zope.app import zapi
from zope.app.generations.interfaces import ISchemaManager
from zope.app.generations.generations import generations_key, Context
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
request_key_format = "evolve-app-%s"
Modified: Zope3/trunk/src/zope/app/homefolder/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/homefolder/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/homefolder/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from zope.interface import Interface
from zope.schema import Field, Bool, Choice
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IHomeFolder(Interface):
"""Describes the home directory of a principal."""
Modified: Zope3/trunk/src/zope/app/i18n/browser/synchronize.py
===================================================================
--- Zope3/trunk/src/zope/app/i18n/browser/synchronize.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/i18n/browser/synchronize.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -25,7 +25,7 @@
from zope.security.proxy import removeSecurityProxy
from zope.app.i18n.browser import BaseView
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
DEFAULT = 'http://localhost:8080/++etc++site/default/zope'
Modified: Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.py
===================================================================
--- Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/i18nfile/browser/i18nfile.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from urllib import quote
from zope.i18n.negotiator import negotiator
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class I18nFileView(object):
@@ -44,7 +44,7 @@
name = 'editForm'
title = _('Edit Form')
- description = _('This edit form allows you to make changes to the ' +
+ description = _('This edit form allows you to make changes to the '
'properties of this file.')
def action(self, contentType, data, language, defaultLanguage,
Modified: Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.py
===================================================================
--- Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/i18nfile/browser/i18nimage.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
from zope.i18n.negotiator import negotiator
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.file.browser.image import ImageData
from zope.app.size import ISized
Modified: Zope3/trunk/src/zope/app/keyreference/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/keyreference/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/keyreference/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
import zope.interface
from zope.schema import DottedName
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class NotYet(Exception):
Modified: Zope3/trunk/src/zope/app/locales/extract.py
===================================================================
--- Zope3/trunk/src/zope/app/locales/extract.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/locales/extract.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -27,7 +27,12 @@
from interfaces import IPOTEntry, IPOTMaker, ITokenEater
from zope.interface import implements
+
+# BBB 2005/10/10
+import zope.deprecation
+zope.deprecation.__show__.off()
from zope.i18nmessageid import MessageID, Message
+zope.deprecation.__show__.on()
DEFAULT_CHARSET = 'UTF-8'
DEFAULT_ENCODING = '8bit'
@@ -70,7 +75,7 @@
Let's create a message entry:
- >>> entry = POTEntry(MessageID("test", default="default"))
+ >>> entry = POTEntry(Message("test", default="default"))
>>> entry.addComment("# Some comment")
>>> entry.addLocationComment(os.path.join("path", "file"), 10)
@@ -86,7 +91,7 @@
Multiline default values generate correct comments:
- >>> entry = POTEntry(MessageID("test", default="\nline1\n\tline2"))
+ >>> entry = POTEntry(Message("test", default="\nline1\n\tline2"))
>>> entry.write(FakeFile())
# Default: ""
# "line1\n"
@@ -192,7 +197,7 @@
We feed it a (fake) file:
- >>> file = StringIO("_('hello', 'buenos dias')")
+ >>> file = StringIO("_(u'hello', u'buenos dias')")
>>> tokenize.tokenize(file.readline, eater)
The catalog of collected message ids contains our example
@@ -280,7 +285,7 @@
lineno = self.__lineno
if default is not None:
- msg = MessageID(msg, default=default)
+ msg = Message(msg, default=default)
entry = (self.__curfile, lineno)
self.__messages.setdefault(msg, {})[entry] = isdocstring
Modified: Zope3/trunk/src/zope/app/locking/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/locking/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/locking/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,12 +20,12 @@
from zope.app.annotation.interfaces import IAttributeAnnotatable
from zope.app.event.interfaces import IObjectEvent
from zope.interface import Interface, Attribute
-from zope.i18nmessageid import MessageIDFactory
+from zope.i18nmessageid import MessageFactory
from zope.interface.common.mapping import IMapping
import zope.interface
import zope.schema
-_ = MessageIDFactory('zope.app.locking')
+_ = MessageFactory('zope.app.locking')
class ILockable(Interface):
Modified: Zope3/trunk/src/zope/app/locking/storage.py
===================================================================
--- Zope3/trunk/src/zope/app/locking/storage.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/locking/storage.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -32,7 +32,7 @@
from zope.app.locking.interfaces import LockingError
from zope.app.size.interfaces import ISized
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
timefunc = time.time
@@ -158,9 +158,7 @@
num_items = self._get_size()
if num_items == 1:
return _('1 item')
- size = _('${items} items')
- size.mapping = {'items': str(num_items)}
- return size
+ return _('${items} items', mapping={'items': str(num_items)})
def _get_size(self):
# We only want to include active locks, so we'd like to simply
Modified: Zope3/trunk/src/zope/app/mail/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/mail/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/mail/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -57,7 +57,7 @@
from zope.interface import Interface, Attribute
from zope.schema import Object, TextLine, Int, Password, BytesLine
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IMailDelivery(Interface):
Modified: Zope3/trunk/src/zope/app/onlinehelp/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/onlinehelp/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/onlinehelp/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
from zope.app.container.interfaces import IContainer
from zope.app.publication.interfaces import IFileContent
from zope.app.file.interfaces import IFile
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IOnlineHelpTopic(IContainer):
"""A Topic is a single help page that you can view. Topics are able to
Modified: Zope3/trunk/src/zope/app/pagetemplate/engine.py
===================================================================
--- Zope3/trunk/src/zope/app/pagetemplate/engine.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/pagetemplate/engine.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -36,7 +36,7 @@
from zope.i18n import translate
from zope.app import zapi
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.traversing.adapters import Traverser, traversePathElement
from zope.app.traversing.interfaces import IPathAdapter, ITraversable
@@ -128,8 +128,8 @@
from zope.app.interpreter.interfaces import IInterpreter
interpreter = zapi.queryUtility(IInterpreter, lang)
if interpreter is None:
- error = _('No interpreter named "${lang_name}" was found.')
- error.mapping = {'lang_name': lang}
+ error = _('No interpreter named "${lang_name}" was found.',
+ mapping={'lang_name': lang})
raise InlineCodeError(error)
globals = self.vars.copy()
Modified: Zope3/trunk/src/zope/app/pluggableauth/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/pluggableauth/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/pluggableauth/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.container.interfaces import IContainer, IContained
from zope.app.container.constraints import ItemTypePrecondition
from zope.app.container.constraints import ContainerTypesConstraint
Modified: Zope3/trunk/src/zope/app/preference/browser.py
===================================================================
--- Zope3/trunk/src/zope/app/preference/browser.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/preference/browser.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,6 +22,7 @@
import zope.schema
from zope.security.proxy import removeSecurityProxy
from zope.i18n import translate
+from zope.i18nmessageid import Message
from zope.app import zapi
from zope.app.basicskin.standardmacros import StandardMacros
@@ -30,7 +31,7 @@
from zope.app.pagetemplate.simpleviewclass import simple
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.tree.browser.cookie import CookieTreeView
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.preference import interfaces
@@ -80,9 +81,9 @@
zope.interface.alsoProvides(removeSecurityProxy(context),
NoneInterface)
- self.label = pref_msg
- self.label.mapping["name"] = translate(context.__title__,
- context=request, default=context.__title__)
+ name = translate(context.__title__, context=request,
+ default=context.__title__)
+ self.label = Message(pref_msg, mapping={u'name': name})
super(EditPreferenceGroup, self).__init__(context, request)
self.setPrefix(context.__id__)
Modified: Zope3/trunk/src/zope/app/presentation/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/presentation/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/presentation/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
import zope.app.container
import zope.app.component.interfaces
from zope.app.container import constraints
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IPageRegistration(zope.app.component.interfaces.IAdapterRegistration):
Modified: Zope3/trunk/src/zope/app/publisher/interfaces/browser.py
===================================================================
--- Zope3/trunk/src/zope/app/publisher/interfaces/browser.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/publisher/interfaces/browser.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -16,7 +16,7 @@
$Id$
"""
from zope.component.interfaces import IView
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.interface import Interface, directlyProvides
from zope.interface.interfaces import IInterface
from zope.schema import TextLine, Text, Choice, URI, Int, InterfaceField
@@ -147,7 +147,7 @@
action = TextLine(
title=_("The URL to display if the item is selected"),
- description=_("When a user selects a browser menu item, the URL"
+ description=_("When a user selects a browser menu item, the URL "
"given in the action is displayed. The action is "
"usually given as a relative URL, relative to the "
"object the menu item is for."),
Modified: Zope3/trunk/src/zope/app/pythonpage/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/pythonpage/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/pythonpage/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
from zope.app.interpreter.interfaces import IInterpreter
from zope.interface import Interface, implements
from zope.schema import SourceText, TextLine
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.security.untrustedpython.interpreter import CompiledProgram
Modified: Zope3/trunk/src/zope/app/pythonpage/browser.py
===================================================================
--- Zope3/trunk/src/zope/app/pythonpage/browser.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/pythonpage/browser.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -16,7 +16,7 @@
$Id$
"""
from zope.app.form.browser.editview import EditView
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class PythonPageEval(object):
"""Evaluate the Python Page."""
Modified: Zope3/trunk/src/zope/app/rdb/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/rdb/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/rdb/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
from zope.interface import Interface
from zope.interface import Attribute
from zope.schema import TextLine
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IDBITypeInfoProvider(Interface):
Modified: Zope3/trunk/src/zope/app/recorder/browser.py
===================================================================
--- Zope3/trunk/src/zope/app/recorder/browser.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/recorder/browser.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -30,7 +30,7 @@
from zope.app.publisher.browser import BrowserView
from zope.app import recorder
from zope.app.testing import dochttp
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.publisher.interfaces import NotFound
@@ -78,6 +78,9 @@
try:
yield re.compile(pattern)
except re.error:
+ #TODO variable insertions must not be expanded
+ # until after the translation... preferably use
+ # mapping here
self.error = _('Invalid regex: %s') % pattern
def _requests(self):
Modified: Zope3/trunk/src/zope/app/registration/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/registration/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/registration/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -0,0 +1 @@
+# make this directory a package
Modified: Zope3/trunk/src/zope/app/rotterdam/xmlobject.py
===================================================================
--- Zope3/trunk/src/zope/app/rotterdam/xmlobject.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/rotterdam/xmlobject.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -28,7 +28,7 @@
from zope.app.container.interfaces import IReadContainer
from zope.app.traversing.api import getParents, getParent, traverse
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
titleTemplate = _('Contains $${num} item(s)')
Modified: Zope3/trunk/src/zope/app/schema/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/schema/browser/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/schema/browser/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
from zope.app import zapi
from zope.app.form.browser.editview import EditView
from zope.app.form.utility import setUpEditWidgets
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.schema.interfaces import IMutableSchema
from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
from zope.app.publisher.browser import BrowserView
@@ -60,12 +60,16 @@
delta = up and -1 or 1
names = self.fieldNames()
if name not in names:
+ #TODO variable insertion must not be expanded until
+ # after the translation... preferably use mapping here
self.errors = (_("Invalid field name: %s" % name),)
status = _("An error occured.")
p = names.index(name) + delta
try:
self.context.moveField(name, p)
except IndexError:
+ #TODO variable insertion must not be expanded until
+ # after the translation... preferably use mapping here
self.errors = (_("Invalid position: %s" % p),)
status = _("An error occured.")
self.update_status = status
Modified: Zope3/trunk/src/zope/app/schemacontent/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/schemacontent/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/schemacontent/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -16,7 +16,7 @@
$Id$
"""
from zope.app.container.interfaces import IAdding
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.publisher.interfaces.browser import IBrowserMenuItem
from zope.interface import Interface, Attribute
from zope.schema import TextLine, Bool, Choice
Modified: Zope3/trunk/src/zope/app/security/browser/auth.py
===================================================================
--- Zope3/trunk/src/zope/app/security/browser/auth.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/security/browser/auth.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -24,7 +24,7 @@
from zope.app.security.interfaces import IUnauthenticatedPrincipal
from zope.app.security.interfaces import ILogout, ILogoutSupported
from zope.app.pagetemplate import ViewPageTemplateFile
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
search_label = _('search-button', 'Search')
Modified: Zope3/trunk/src/zope/app/security/permission.py
===================================================================
--- Zope3/trunk/src/zope/app/security/permission.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/security/permission.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -23,7 +23,7 @@
from zope.app.location import Location
from zope.app.security.interfaces import IPermission
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
NULL_ID = _('<permission not activated>')
class Permission(object):
Modified: Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/securitypolicy/browser/granting.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -25,7 +25,7 @@
from zope.app.form.browser import RadioWidget
from zope.app.form.browser.widget import renderElement
from zope.app.form.interfaces import MissingInputError
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.form.interfaces import IInputWidget
from zope.app.securitypolicy.interfaces import IPrincipalPermissionManager
Modified: Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/securitypolicy/browser/rolepermissionview.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
from zope.app import zapi
from zope.app.exception.interfaces import UserError
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.security.settings import Unset, Allow, Deny
from zope.app.security.interfaces import IPermission
from zope.app.securitypolicy.interfaces import IRole, IRolePermissionManager
@@ -143,10 +143,11 @@
for permission in self.permissions():
rperm = permission.id
if rperm in allowed and rperm in denied:
+ permission_translated = translate(
+ permission.title, context=self.request)
msg = _('You choose both allow and deny for permission'
- ' "${permission}". This is not allowed.')
- msg.mapping = {'permission': translate(
- permission.title, context=self.request)}
+ ' "${permission}". This is not allowed.',
+ mapping = {'permission': permission_translated})
raise UserError(msg)
if rperm in allowed:
prm.grantPermissionToRole(rperm, role_id)
@@ -159,8 +160,9 @@
if changed:
formatter = self.request.locale.dates.getFormatter(
'dateTime', 'medium')
- status = _("Settings changed at ${date_time}")
- status.mapping = {'date_time': formatter.format(datetime.utcnow())}
+ status = _("Settings changed at ${date_time}",
+ mapping={'date_time':
+ formatter.format(datetime.utcnow())})
return status
Modified: Zope3/trunk/src/zope/app/securitypolicy/browser/tests/test_rolepermissionview.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/browser/tests/test_rolepermissionview.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/securitypolicy/browser/tests/test_rolepermissionview.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -17,9 +17,9 @@
"""
import unittest
+import zope.interface
from zope.i18n.interfaces import ITranslationDomain
-from zope.i18nmessageid import MessageID
-import zope.interface
+from zope.i18nmessageid import Message
from zope.publisher.browser import TestRequest
from zope.app.exception.interfaces import UserError
@@ -68,10 +68,10 @@
def setUp(self):
PlacefulSetup.setUp(self)
- defineRole('manager', MessageID('Manager', 'testdomain'))
- defineRole('member', MessageID('Member', 'testdomain'))
- definePermission('read', MessageID('Read', 'testdomain'))
- definePermission('write', MessageID('Write', 'testdomain'))
+ defineRole('manager', Message('Manager', 'testdomain'))
+ defineRole('member', Message('Member', 'testdomain'))
+ definePermission('read', Message('Read', 'testdomain'))
+ definePermission('write', Message('Write', 'testdomain'))
site = RolePermissionManager()
self.view = RolePermissionView(FakeSiteManager(site), None)
ztapi.provideUtility(ITranslationDomain,
Modified: Zope3/trunk/src/zope/app/securitypolicy/role.py
===================================================================
--- Zope3/trunk/src/zope/app/securitypolicy/role.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/securitypolicy/role.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
from zope.app.location import Location
from zope.app.securitypolicy.interfaces import IRole
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
NULL_ID = _('<role not activated>')
class Role(object):
Modified: Zope3/trunk/src/zope/app/session/http.py
===================================================================
--- Zope3/trunk/src/zope/app/session/http.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/session/http.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
from persistent import Persistent
from zope.app.annotation.interfaces import IAttributeAnnotatable
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app import zapi
from zope.app.session.interfaces import IClientIdManager
from zope.app.component.interfaces import ILocalUtility
Modified: Zope3/trunk/src/zope/app/session/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/session/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/session/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from zope.interface.common.mapping import IMapping, IReadMapping, IWriteMapping
from zope import schema
from zope.app.container.interfaces import IContainer
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
__docformat__ = 'restructuredtext'
Modified: Zope3/trunk/src/zope/app/size/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/size/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/size/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -15,7 +15,7 @@
$Id$
"""
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.size.interfaces import ISized
from zope.interface import implements
@@ -47,9 +47,5 @@
if size <= 1024:
return _('1 KB')
if size > 1048576:
- size_str = _('${size} MB')
- size_str.mapping = {'size': '%0.02f' % (size / 1048576.0)}
- return size_str
- size_str = _('${size} KB')
- size_str.mapping = {'size': '%d' % (size / 1024.0)}
- return size_str
+ return _('${size} MB', mapping={'size': '%0.02f' % (size / 1048576.0)})
+ return _('${size} KB', mapping={'size': '%d' % (size / 1024.0)})
Modified: Zope3/trunk/src/zope/app/sqlscript/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/sqlscript/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/sqlscript/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -18,7 +18,7 @@
import zope.schema
from zope.app import zapi
from zope.app.rdb.interfaces import ISQLCommand
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class MissingInput(Exception):
pass
Modified: Zope3/trunk/src/zope/app/traversing/browser/absoluteurl.py
===================================================================
--- Zope3/trunk/src/zope/app/traversing/browser/absoluteurl.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/traversing/browser/absoluteurl.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -21,7 +21,7 @@
from zope.publisher.browser import IBrowserRequest
import zope.component
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.publisher.browser import BrowserView
from zope.app.traversing.browser.interfaces import IAbsoluteURL
Modified: Zope3/trunk/src/zope/app/versioncontrol/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/versioncontrol/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/versioncontrol/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -25,8 +25,8 @@
import zope.app.annotation.interfaces
import zope.app.event.interfaces
-from zope.i18nmessageid import MessageIDFactory
-_ = MessageIDFactory('zope.app.versioncontrol')
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory('zope.app.versioncontrol')
class VersionControlError(Exception):
Modified: Zope3/trunk/src/zope/app/viewlet/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/viewlet/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/viewlet/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
import zope.schema
from zope.tales import interfaces
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.publisher.interfaces.browser import IBrowserView
Modified: Zope3/trunk/src/zope/app/workflow/interfaces/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/workflow/interfaces/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/workflow/interfaces/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -16,7 +16,7 @@
$Id$
"""
from zope.interface import Interface, Attribute
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.container.interfaces import IContainer
Modified: Zope3/trunk/src/zope/app/workflow/stateful/browser/contentworkflow.py
===================================================================
--- Zope3/trunk/src/zope/app/workflow/stateful/browser/contentworkflow.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/workflow/stateful/browser/contentworkflow.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -17,7 +17,7 @@
"""
from zope.app import zapi
from zope.app.component.interface import nameToInterface, interfaceToName
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.form.utility import setUpWidgets
from zope.app.form.interfaces import IInputWidget
from zope.interface import Interface
Modified: Zope3/trunk/src/zope/app/workflow/stateful/browser/instance.py
===================================================================
--- Zope3/trunk/src/zope/app/workflow/stateful/browser/instance.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/workflow/stateful/browser/instance.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -23,7 +23,7 @@
from zope.app.form.browser.submit import Update
from zope.app.form.utility import setUpWidget, applyWidgetsChanges
from zope.app.form.interfaces import IInputWidget
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.dublincore.interfaces import IZopeDublinCore
from zope.app.publisher.browser import BrowserView
Modified: Zope3/trunk/src/zope/app/workflow/stateful/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/workflow/stateful/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/workflow/stateful/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -19,7 +19,7 @@
from zope.security.checker import CheckerPublic
from zope.interface import Interface, Attribute
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.workflow.interfaces import IWorkflowEvent
from zope.app.workflow.interfaces import IProcessDefinition
from zope.app.workflow.interfaces import IProcessInstance
Modified: Zope3/trunk/src/zope/app/zptpage/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/zptpage/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -17,7 +17,7 @@
"""
from zope.schema import SourceText, Bool
from zope.interface import Interface, Attribute
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
class IZPTPage(Interface):
"""ZPT Pages are a persistent implementation of Page Templates."""
Modified: Zope3/trunk/src/zope/app/zptpage/zptpage.py
===================================================================
--- Zope3/trunk/src/zope/app/zptpage/zptpage.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/app/zptpage/zptpage.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -22,7 +22,7 @@
from zope.pagetemplate.pagetemplate import PageTemplate
from zope.app.pagetemplate.engine import AppPT
-from zope.app.i18n import ZopeMessageIDFactory as _
+from zope.app.i18n import ZopeMessageFactory as _
from zope.app.size.interfaces import ISized
from zope.app.filerepresentation.interfaces import IReadFile, IWriteFile
from zope.app.filerepresentation.interfaces import IFileFactory
@@ -107,9 +107,7 @@
'See ISized'
if self.num_lines == 1:
return _('1 line')
- lines = _('${lines} lines')
- lines.mapping = {'lines': str(self.num_lines)}
- return lines
+ return _('${lines} lines', mapping={'lines': str(self.num_lines)})
# File-system access adapters
Modified: Zope3/trunk/src/zope/configuration/fields.py
===================================================================
--- Zope3/trunk/src/zope/configuration/fields.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/configuration/fields.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -386,8 +386,8 @@
u'Hello world!': [('file location', 8),
('file location', 8)]}}
- >>> from zope.i18n.messageid import MessageID
- >>> isinstance(context.i18n_strings['testing'].keys()[0], MessageID)
+ >>> from zope.i18nmessageid import Message
+ >>> isinstance(context.i18n_strings['testing'].keys()[0], Message)
1
Explicit Message IDs
@@ -401,8 +401,8 @@
>>> i = field.fromUnicode(u'[] [Some] text')
>>> i
u'[Some] text'
- >>> i.default
- u'[Some] text'
+ >>> i.default is None
+ True
"""
implements(IFromUnicode)
@@ -432,8 +432,8 @@
# Convert to a message id, importing the factory, if necessary
factory = self.__factories.get(domain)
if factory is None:
- import zope.i18n.messageid
- factory = zope.i18n.messageid.MessageIDFactory(domain)
+ import zope.i18nmessageid
+ factory = zope.i18nmessageid.MessageFactory(domain)
self.__factories[domain] = factory
msgid = factory(v, default)
Modified: Zope3/trunk/src/zope/schema/_bootstrapinterfaces.py
===================================================================
--- Zope3/trunk/src/zope/schema/_bootstrapinterfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/schema/_bootstrapinterfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -17,8 +17,8 @@
"""
import zope.interface
-from zope.i18nmessageid import MessageIDFactory
-_ = MessageIDFactory("zope")
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("zope")
class StopValidation(Exception):
"""Raised if the validation is completed early.
Modified: Zope3/trunk/src/zope/schema/interfaces.py
===================================================================
--- Zope3/trunk/src/zope/schema/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/schema/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -20,8 +20,8 @@
from zope.schema._bootstrapfields import Container, Iterable
from zope.schema._bootstrapfields import Field, Text, TextLine, Bool, Int
-from zope.i18nmessageid import MessageIDFactory
-_ = MessageIDFactory("zope")
+from zope.i18nmessageid import MessageFactory
+_ = MessageFactory("zope")
# Import from _bootstrapinterfaces only because other packages will expect
# to find these interfaces here.
Modified: Zope3/trunk/src/zope/schema/tests/test_objectfield.py
===================================================================
--- Zope3/trunk/src/zope/schema/tests/test_objectfield.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/schema/tests/test_objectfield.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -17,8 +17,7 @@
"""
from unittest import TestSuite, main, makeSuite
-from zope.i18nmessageid import MessageIDFactory
-
+from zope.i18nmessageid import MessageFactory
from zope.interface import Attribute, Interface, implements
from zope.schema import Object, TextLine
from zope.schema.fieldproperty import FieldProperty
@@ -27,7 +26,7 @@
from zope.schema.interfaces import WrongType, SchemaNotFullyImplemented
from zope.schema.tests.test_field import FieldTestBase
-_ = MessageIDFactory('zope')
+_ = MessageFactory('zope')
class ITestSchema(Interface):
Modified: Zope3/trunk/src/zope/tal/talgettext.py
===================================================================
--- Zope3/trunk/src/zope/tal/talgettext.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zope/tal/talgettext.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -40,7 +40,7 @@
from zope.tal.dummyengine import DummyEngine
from zope.tal.interfaces import ITALExpressionEngine
from zope.tal.taldefs import TALExpressionError
-from zope.i18nmessageid import MessageID
+from zope.i18nmessageid import Message
pot_header = '''\
# SOME DESCRIPTIVE TITLE.
@@ -113,11 +113,11 @@
# interface
position=None):
- # Make the message is a MessageID object, if the default differs
+ # Make the message is a Message object, if the default differs
# from the value, so that the POT generator can put the default
# text into a comment.
if default is not None and normalize(default) != msgid:
- msgid = MessageID(msgid, default=default)
+ msgid = Message(msgid, default=default)
if domain not in self.catalog:
self.catalog[domain] = {}
Modified: Zope3/trunk/src/zwiki/__init__.py
===================================================================
--- Zope3/trunk/src/zwiki/__init__.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zwiki/__init__.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -15,6 +15,5 @@
$Id$
"""
-
-from zope.i18nmessageid import MessageIDFactory
-ZWikiMessageID = MessageIDFactory("zwiki")
+from zope.i18nmessageid import MessageFactory
+ZWikiMessageFactory = MessageFactory("zwiki")
Modified: Zope3/trunk/src/zwiki/interfaces.py
===================================================================
--- Zope3/trunk/src/zwiki/interfaces.py 2005-10-11 18:36:45 UTC (rev 39063)
+++ Zope3/trunk/src/zwiki/interfaces.py 2005-10-11 18:40:10 UTC (rev 39064)
@@ -27,7 +27,7 @@
from zope.app.container.constraints import ItemTypePrecondition
from zope.app.event.interfaces import IObjectEvent
-from zwiki import ZWikiMessageID as _
+from zwiki import ZWikiMessageFactory as _
class IComment(Interface):
"""A simple Wiki Page comment.
More information about the Zope3-Checkins
mailing list