[Zope3-checkins] CVS: Zope3/src/zope/tal - dummyengine.py:1.11.18.3 talinterpreter.py:1.22.4.3

[Stephan Richter]

Update of /cvs-repository/Zope3/src/zope/tal
In directory cvs.zope.org:/tmp/cvs-serv24099/src/zope/tal

Modified Files:
      Tag: srichter-i18n-macro-interaction-branch
	dummyengine.py talinterpreter.py 
Log Message:
Fixed one bug, found two more.


=== Zope3/src/zope/tal/dummyengine.py 1.11.18.2 => 1.11.18.3 ===
--- Zope3/src/zope/tal/dummyengine.py:1.11.18.2	Fri Aug  8 11:58:08 2003
+++ Zope3/src/zope/tal/dummyengine.py	Fri Aug  8 12:46:30 2003
@@ -232,10 +232,6 @@
         # If the domain is a string method, then transform the string
         # by calling that method.
 
-        print '*'*70
-        print msgid
-        print mapping
-        print '*'*70
         # MessageID attributes override arguments
         if isinstance(msgid, MessageID):
             domain = msgid.domain


=== Zope3/src/zope/tal/talinterpreter.py 1.22.4.2 => 1.22.4.3 ===
--- Zope3/src/zope/tal/talinterpreter.py:1.22.4.2	Fri Aug  8 11:58:08 2003
+++ Zope3/src/zope/tal/talinterpreter.py	Fri Aug  8 12:46:30 2003
@@ -487,6 +487,12 @@
             # Evaluate the value to be associated with the variable in the
             # i18n interpolation dictionary.
             value = self.engine.evaluate(expression)
+
+            # evaluate() does not do any I18n, so we do it here. 
+            if isinstance(value, MessageID):
+                # Translate this now.
+                value = self.engine.translate(value)
+
         # Either the i18n:name tag is nested inside an i18n:translate in which
         # case the last item on the stack has the i18n dictionary and string
         # representation, or the i18n:name and i18n:translate attributes are