[Checkins] SVN: zope.i18n/trunk/ - Use getSiteManager rather than getGlobalSiteManager in ZCML (these
Chris McDonough
chrism at plope.com
Mon Dec 14 07:22:58 EST 2009
Log message for revision 106482:
- Use getSiteManager rather than getGlobalSiteManager in ZCML (these
should be one in the same in any non-fancy setup, however if you've
hooked getSiteManager, you want the ZCML handler to use the hooked
version).
Changed:
U zope.i18n/trunk/CHANGES.txt
U zope.i18n/trunk/src/zope/i18n/zcml.py
-=-
Modified: zope.i18n/trunk/CHANGES.txt
===================================================================
--- zope.i18n/trunk/CHANGES.txt 2009-12-14 10:38:23 UTC (rev 106481)
+++ zope.i18n/trunk/CHANGES.txt 2009-12-14 12:22:58 UTC (rev 106482)
@@ -8,6 +8,11 @@
- It's a critical error when the ``GetText`` library is unavailable
and compilation is required.
+- Use getSiteManager rather than getGlobalSiteManager in ZCML (these
+ should be one in the same in any non-fancy setup, however if you've
+ hooked getSiteManager, you want the ZCML handler to use the hooked
+ version).
+
3.7.1 (2009-08-07)
------------------
Modified: zope.i18n/trunk/src/zope/i18n/zcml.py
===================================================================
--- zope.i18n/trunk/src/zope/i18n/zcml.py 2009-12-14 10:38:23 UTC (rev 106481)
+++ zope.i18n/trunk/src/zope/i18n/zcml.py 2009-12-14 12:22:58 UTC (rev 106482)
@@ -20,7 +20,7 @@
import os
-from zope.component import getGlobalSiteManager
+from zope.component import getSiteManager
from zope.component import queryUtility
from zope.component.interface import provideInterface
from zope.configuration.fields import Path
@@ -52,7 +52,7 @@
def handler(catalogs, name):
""" special handler handling the merging of two message catalogs """
- gsm = getGlobalSiteManager()
+ gsm = getSiteManager()
# Try to get an existing domain and add the given catalogs to it
domain = queryUtility(ITranslationDomain, name)
if domain is None:
More information about the checkins
mailing list