[Erp5-report] r42600 kazuhiko - in /erp5/trunk/bt5/erp5_forge: ExtensionTemplateItem/ bt/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Jan 21 17:33:28 2011
New Revision: 42600

URL: http://svn.erp5.org?rev=42600&view=rev
Log:
make ERP5Site_getToBeTranslatedMessageListFromEntireSystemAsPot working on Zope-2.12 too.

Modified:
    erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py
    erp5/trunk/bt5/erp5_forge/bt/revision

Modified: erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py?rev=42600&r1=42599&r2=42600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/ExtensionTemplateItem/Glossary.py [utf8] Fri Jan 21 17:33:28 2011
@@ -53,10 +53,16 @@ def getActionTitleListFromAllActionProvi
 
 
 from StringIO import StringIO
-from TAL.HTMLTALParser import HTMLTALParser
-from TAL.TALParser import TALParser
-from TAL.TALGenerator import TALGenerator
-from TAL.DummyEngine import name_match
+try:
+  from TAL.HTMLTALParser import HTMLTALParser
+  from TAL.TALParser import TALParser
+  from TAL.TALGenerator import TALGenerator
+  from TAL.DummyEngine import name_match
+except ImportError:
+  from zope.tal.htmltalparser import HTMLTALParser
+  from zope.tal.talparser import TALParser
+  from zope.tal.talgenerator import TALGenerator
+  from zope.tal.dummyengine import name_match
 def findStaticTranslationText(page_template, func_name_list):
   def iterate(node, target_name, function):
     if type(node) is list:
@@ -125,8 +131,12 @@ def findStaticTranslationText(page_templ
 #
 # Utility class for findStaticTranslationText
 #
-from TAL.TALInterpreter import TALInterpreter
-from TAL.DummyEngine import DummyEngine
+try:
+  from TAL.TALInterpreter import TALInterpreter
+  from TAL.DummyEngine import DummyEngine
+except ImportError:
+  from zope.tal.talinterpreter import TALInterpreter
+  from zope.tal.dummyengine import DummyEngine
 class MyDummyEngine(DummyEngine):
 
   def evaluate(self, expression):
@@ -138,7 +148,7 @@ class MyDummyTALInterpreter(TALInterpret
   _i18n_message_id_dict = None
   _currentTag = None
 
-  def translate(self, msgid, default, i18ndict, obj):
+  def translate(self, msgid, default=None, i18ndict=None, obj=None):
     try:
       self._i18n_message_id_dict[msgid] = None
     except TypeError:

Modified: erp5/trunk/bt5/erp5_forge/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/revision?rev=42600&r1=42599&r2=42600&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_forge/bt/revision [utf8] Fri Jan 21 17:33:28 2011
@@ -1 +1 @@
-638
\ No newline at end of file
+639
\ No newline at end of file